| commit | 3f413f1a17ae030958a428bebd2246c36a20a80f | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Fri Nov 22 01:16:57 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 22 01:16:57 2019 -0800 |
| tree | 6bdb4e17f02cc9140df115a7474e43c517f5a258 | |
| parent | 59185d0931306edde97f624c3a9f191c3a98ab66 [diff] | |
| parent | 88594b8bf799a436d58ca566f83c3fe9de0a850b [diff] |
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours am: 88594b8bf7 -s ours am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history Change-Id: I62b7db5b6b08a48b90c3a23f1d72cb97f36a085f