OSDN Git Service

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

Change-Id: I3e28ba70ad33d32b293c9f11b5a5110e0e8a5fc7


Trivial merge