| commit | 3bfbc531b30e83c87ae1ad134f23184b1f152e36 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Jul 12 17:46:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 17:46:58 2016 +0000 |
| tree | 661beb53f3d10a3768436f8722d831aa726b5ca5 | |
| parent | 859029ff7b87087e5e70a087a75bac5836f41a22 [diff] | |
| parent | e278cf7665eb3bcf529b8a12bbbca9277241b9ac [diff] |
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am: e278cf7665 Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624