

+++ -146,7 +146,7 \ core/java/android/os/ISchedulingPolicyService.aidl \ core/java/android/os/IUpdateLock.aidl \ - core/java/android/os/IUserManager.aidl \ + core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ core/java/android/service/dreams/IDreamManager.aidl \ core/java/android/service/dreams/IDreamService.aidl \ -164,6 +164,8 \ core/java/android/view/IRotationWatcher.aidl \ core/java/android/view/IWindow.aidl \ + core/java/android/view/IWindowFocusObserver.aidl \ + core/java/android/view/IWindowId.aidl \ core/java/android/view/IWindowManager.aidl \ core/java/android/view/IWindowSession.aidl \ core/java/android/speech/IRecognitionListener.aidl \ -178,6 +180,7 \ core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \ core/java/com/android/internal/backup/IBackupTransport.aidl \ + core/java/com/android/internal/backup/IObbBackupService.aidl \ core/java/com/android/internal/policy/IFaceLockCallback.aidl \ core/java/com/android/internal/policy/IFaceLockInterface.aidl \ core/java/com/android/internal/os/IDropBoxManagerService.aidl \ diff -git a/api/current.txt b/api/current. Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev diff -git a/Android.mk b/Android.mk

Currently I am working on a great Sci-Fi strategy game but I.
