OSDN Git Service

Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus(...
authorDan Yu <dsyu@google.com>
Fri, 15 Jul 2016 20:17:01 +0000 (20:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 20:17:01 +0000 (20:17 +0000)
am: d5b43852dc

Change-Id: I54158112da7872a7968cd4661c4f321ca459c9db


Trivial merge