Mahaver Chopra e64f60a455 Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev ...

am: 695a1c50a2

Change-Id: I8976511deb994983abbb17b2830b98878c92631b

2016-07-13 12:33:59 +00:00

..

java/com/android/server

Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev

2016-07-13 12:33:59 +00:00

jni

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

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

Android.mk

…