| commit | ecce1ffdef0f1583d36a781f917b4c9958f2bfd7 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Jul 12 17:57:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 17:57:31 2016 +0000 |
| tree | 4e3f1dfb5b07fc7e6997bfb3730cb3514a767bf6 | |
| parent | dfd393a1e2f5c5c9c4469714b9bb55d1864e2783 [diff] | |
| parent | c6b85035b4c1546485fdfb1c5b356ef855bc9443 [diff] |
Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665 am: c6b85035b4 Change-Id: Ib7084c7f4834b682d44e1a6e1c9d71a53a82f438