OSDN Git Service

Merge "Merge \\"Include new constant for encryption status in the getter\\'s javadoc...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 12 Jul 2016 17:57:52 +0000 (17:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 17:57:53 +0000 (17:57 +0000)

Trivial merge