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:47:24 +0000 (17:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 17:47:25 +0000 (17:47 +0000)
commitd2e6a62838955e883f0ed43e172a0a5fc510e624
treeaed83aadf37c86bdc16b4963a619807ca10ab2ef
parent7ac1886ae952db15012104701541444bce10683e
parent3bfbc531b30e83c87ae1ad134f23184b1f152e36
Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am: e278cf7665" into nyc-mr1-dev