* commit '468f179c2d1ae6a8c7bf6e563d99b495b2f39a59':
Polish animations for fingerprint icon
MediaPlayer: add mPreparing to weed out unwanted prepared messages
BatteryStatsService: Only query bluetooth on demand.
Indicate failed scans with EXTRA_RESULTS_UPDATED
BatteryStatsService: Only query bluetooth on demand.
Indicate failed scans with EXTRA_RESULTS_UPDATED
For getHomeActivity() only return current user.
Fix application moves.
Close race condition in binderDied()
Write packages.list when adding/removing users.
camera: Add AIDL interface for CameraServiceProxy.
Fix NPE in setSurfaceTexure
Deal more gracefully with null smallIcons.
Don't crash in bugreport on devices without BT
Push initial disk state, handle empty media.
1aae6b87c9