| commit | d2e6a62838955e883f0ed43e172a0a5fc510e624 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jul 12 17:47:24 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 12 17:47:25 2016 +0000 |
| tree | aed83aadf37c86bdc16b4963a619807ca10ab2ef | |
| parent | 7ac1886ae952db15012104701541444bce10683e [diff] | |
| parent | 3bfbc531b30e83c87ae1ad134f23184b1f152e36 [diff] |
Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am: e278cf7665" into nyc-mr1-dev