Jim Miller 7d5389bd07 Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev ...

am: 49fd320574

Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945

2016-07-07 22:38:27 +00:00

..

java/com/android/server

Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev

2016-07-07 22:38:27 +00:00

jni

Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b

2016-05-28 16:41:13 +00:00

Android.mk

Enable boost-locked-region-priority

2016-05-19 08:27:19 +00:00