OSDN Git Service

Merge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 10 May 2016 22:20:08 +0000 (22:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 May 2016 22:20:08 +0000 (22:20 +0000)
commitf87eb4fc89bf51820fdb548e07ab8cb9e04e3835
tree61a61d48cb91c5a387b116c69e0947d5d3425997
parent54e7cc1c84eede1a0a7f14e05668e10e5b7705b4
parentec91e8424f5798c10dfeb734c9358589a15bc414
Merge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b am: fa85e9f0c4" into nyc-mr1-dev-plus-aosp