[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours

Browse Source

am: 88594b8bf7 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: I62b7db5b6b08a48b90c3a23f1d72cb97f36a085f

...

This commit is contained in:

Bonian Chen

2019-11-22 01:16:57 -08:00

committed by android-build-merger

parent 59185d0931 88594b8bf7

commit 3f413f1a17

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