OSDN Git Service

Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 25 Aug 2017 22:33:27 +0000 (22:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 25 Aug 2017 22:33:27 +0000 (22:33 +0000)

Trivial merge