| commit | 2e3cecaf0343c61db72b1bb2966be5c88e5d3fa3 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Mar 07 17:00:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 07 17:00:15 2016 +0000 |
| tree | 32a8904af1c277305ed82d5f4ae6dec937bcc78d | |
| parent | d047d9ffc366c7724e67ff31867f74f184ab95b5 [diff] | |
| parent | 869f2c8622ac1e7fa0a3942c7fc7b105a2ab0b2e [diff] |
Merge "Distinguish between unencrypted and unencryptable" into nyc-dev am: 72d2e06f4e am: bdd5908766 * commit 'bdd5908766b8e249e1c0487a576b8589553c2f37': Distinguish between unencrypted and unencryptable