OSDN Git Service

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

Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55


Trivial merge