| commit | 96af3571b8373613ed768092375c96a99fbe7229 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue May 10 22:22:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 10 22:22:33 2016 +0000 |
| tree | 7f5120cb73fa492c177b63baf1ab217ee797155f | |
| parent | 95f1027a7abbe414b649e3040e5f7212ad76fec1 [diff] | |
| parent | f87eb4fc89bf51820fdb548e07ab8cb9e04e3835 [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 am: f87eb4fc89 * commit 'f87eb4fc89bf51820fdb548e07ab8cb9e04e3835': Change-Id: I6804b5756180a8097cfc793db27bb2cfed8939f2