OSDN Git Service

Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
authorPaul Crowley <paulcrowley@google.com>
Tue, 25 Nov 2014 21:13:27 +0000 (21:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 25 Nov 2014 21:13:30 +0000 (21:13 +0000)
commit77e25331ca7ad1fb69fbe7fbec69179824e46e59
tree561e02a290207d8e115853c60d1ddabff869b8f8
parent3749541a206390054b22d5f5bddc1b43f348f433
parenta7e87acb2416d4212c84fb9c45353dbf6ee15e6a
Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java