| commit | c2ab1921e715b2e83b839798e92fc0f2fa691cb6 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Fri Aug 25 22:55:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 25 22:55:15 2017 +0000 |
| tree | 13f74906a513e3fd5bcd20e6988afe1d2e17efb8 | |
| parent | bdb7d2f36b52fdd8f831ff87d0c0e8875a19418a [diff] | |
| parent | 8a2fa30a7c6a760ab48df72985db48fb53dab633 [diff] |
Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev am: eb29dced71 am: 8a2fa30a7c Change-Id: I3e1866f3c7ec36267d6a38de1415745ff9dd6b90