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)

Trivial merge