OSDN Git Service

Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
authorAndrew Scull <ascull@google.com>
Fri, 14 Apr 2017 18:01:24 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 18:01:24 +0000 (18:01 +0000)
commit1b674659182e5d012f86d75cc6cb0016546a4af9
tree84fdab456dea35762db0c7320105cd20e036cbe2
parent4df23412c6aa2b2239bda86ff5c4e9f3fd355b7d
parentd4be031c76a0f451b8f47046d0962178f00c5773
Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
Android.mk
api/system-current.txt
core/java/android/app/SystemServiceRegistry.java
core/java/android/content/Context.java
core/java/android/os/UserManager.java
core/res/AndroidManifest.xml
services/java/com/android/server/SystemServer.java