OSDN Git Service

Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and...
authorDan Yu <dsyu@google.com>
Fri, 15 Jul 2016 19:59:56 +0000 (19:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 19:59:57 +0000 (19:59 +0000)

Trivial merge