| commit | ac201fd93da36a6e2bc38c0a5bf41c09656f0ea8 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Jul 12 18:13:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 18:13:00 2016 +0000 |
| tree | 4ac64ccafb486de92cb738aef7a386aacf45aba1 | |
| parent | 634841d448c4efcb56e8b090f8b4474bfdb48bc0 [diff] | |
| parent | b2ec84bb48f8e739f303de1edcb746ca6baa0656 [diff] |
Merge \"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf7665 am: c6b85035b4\" into nyc-mr1-dev-plus-aosp am: b2ec84bb48 Change-Id: Ic0acda5386b9cb6f6f11d60fb96b6ef626a6f551