OSDN Git Service

Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\"...
authorAmith Yamasani <yamasani@google.com>
Tue, 12 Jul 2016 17:57:31 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 17:57:31 +0000 (17:57 +0000)
commitecce1ffdef0f1583d36a781f917b4c9958f2bfd7
tree4e3f1dfb5b07fc7e6997bfb3730cb3514a767bf6
parentdfd393a1e2f5c5c9c4469714b9bb55d1864e2783
parentc6b85035b4c1546485fdfb1c5b356ef855bc9443
Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665
am: c6b85035b4

Change-Id: Ib7084c7f4834b682d44e1a6e1c9d71a53a82f438
core/java/android/app/admin/DevicePolicyManager.java