OSDN Git Service

Merge "Remove FRP wipe support for device initializers" into mnc-dev
authorCraig Lafayette <craiglafa@google.com>
Thu, 18 Jun 2015 15:44:47 +0000 (15:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jun 2015 15:44:49 +0000 (15:44 +0000)
commitb4c469095f12972ef04558961ddbdbdfe8305ccb
tree19ea817ce0bab35a623d5a705aa157ac8255ef5d
parent77b093824fac57255dcd181db662f8f5729fe1cc
parent09ad6bfe9619ff7a61209131f1f3182d53d840d0
Merge "Remove FRP wipe support for device initializers" into mnc-dev
api/current.txt
api/system-current.txt
core/java/android/app/admin/DevicePolicyManager.java
core/res/AndroidManifest.xml