OSDN Git Service

Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it...
authorAlex Kershaw <alexkershaw@google.com>
Mon, 19 Mar 2018 20:15:31 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Mar 2018 20:15:31 +0000 (20:15 +0000)
commitc4457268337466db53d9afdbd106e8dd8d9f5b32
tree65ab8847ec39c8b081e0d60fdf09cc55d9b133ca
parent3276d94bba05d37e8b729fa32d9da0c337e8767f
parent56be97edd0327810adccde52a7664449ab67b9e5
Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it's a no-op (and silent fail) when called from a non-system user." into pi-dev
am: 56be97edd0

Change-Id: I26c48173f62c19c437a6f24bd63159f80e3f6fb1