| commit | 8704b90878c990d96326bdf85f3cb791c1bf2892 | [log] [tgz] |
|---|---|---|
| author | Alex Cruz <du.alexcruz@gmail.com> | Tue Mar 06 20:44:19 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 06 20:44:19 2018 +0000 |
| tree | 7f5fa9345e6ce6f67515b597c108018b84773542 | |
| parent | 786fa66b6dff48bfe52f800905654b6d776a9953 [diff] | |
| parent | ab5a3898f5b4b4f1a24101e12957788069a15e17 [diff] |
Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5 -s ours Change-Id: Ie07848592baa2ee12806a1aa106e75c9f1cd4a92