OSDN Git Service

Merge \"Include new constant for encryption status in the getter\'s javadoc\" into...
authorAmith Yamasani <yamasani@google.com>
Tue, 12 Jul 2016 17:46:58 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 17:46:58 +0000 (17:46 +0000)
am: e278cf7665

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624

1  2 
core/java/android/app/admin/DevicePolicyManager.java