OSDN Git Service

Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
authorPaul Crowley <paulcrowley@google.com>
Fri, 25 Aug 2017 22:40:15 +0000 (22:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Aug 2017 22:40:15 +0000 (22:40 +0000)
commit8a2fa30a7c6a760ab48df72985db48fb53dab633
tree1a71f8d497d40c98d2ddfdfc62afc38052b45da8
parent55ebbfda6188525e94925647f0ad9d4d23b6b300
parenteb29dced7182d4fc955fd380ba97c67f8285e5b0
Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
am: eb29dced71

Change-Id: I561e352eadaa7ea975eb305b5d24e27bef337e51