OSDN Git Service

Merge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b...
authorPaul Crowley <paulcrowley@google.com>
Tue, 10 May 2016 22:22:33 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 22:22:33 +0000 (22:22 +0000)
am: f87eb4fc89

* commit 'f87eb4fc89bf51820fdb548e07ab8cb9e04e3835':

Change-Id: I6804b5756180a8097cfc793db27bb2cfed8939f2


Trivial merge