| commit | f87eb4fc89bf51820fdb548e07ab8cb9e04e3835 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 10 22:20:08 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 22:20:08 2016 +0000 |
| tree | 61a61d48cb91c5a387b116c69e0947d5d3425997 | |
| parent | 54e7cc1c84eede1a0a7f14e05668e10e5b7705b4 [diff] | |
| parent | ec91e8424f5798c10dfeb734c9358589a15bc414 [diff] |
Merge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b am: fa85e9f0c4" into nyc-mr1-dev-plus-aosp