OSDN Git Service

Merge "Fix SecurityException in getStorageEncryptionStatus" into nyc-dev
authorRubin Xu <rubinxu@google.com>
Tue, 29 Mar 2016 13:36:48 +0000 (13:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Mar 2016 13:36:49 +0000 (13:36 +0000)

Trivial merge