Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5 -s ours

Browse Source

am: 8704b90878  -s ours

Change-Id: Ie2e6a2b036e08796f34ed7fdd9e1bce46bf681d6

...

This commit is contained in:

Alex Cruz

2018-03-06 21:28:29 +00:00

committed by android-build-merger

parent 8aaf313532 8704b90878

commit a09731f592

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available