OSDN Git Service

Merge "Provide lockdown of date/time device owners." into lmp-dev
authorSander Alewijnse <salewijnse@google.com>
Wed, 27 Aug 2014 14:25:33 +0000 (14:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Aug 2014 14:25:35 +0000 (14:25 +0000)
1  2 
api/current.txt
core/java/android/app/admin/DevicePolicyManager.java

diff --cc api/current.txt
Simple merge