| commit | 821a1259e717d014daabe5d9cf34997313b2ad04 | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Thu Nov 21 13:41:52 2019 +0800 |
| committer | Bonian Chen <bonianchen@google.com> | Fri Nov 22 02:36:11 2019 +0000 |
| tree | 907ab2f282933671036a3fae40c8adcc2512b8c7 | |
| parent | 6c9b9f41d6bcbb03d2450c9b6260114a03ef8e15 [diff] |
[Settings] Fix conflict of AOSP merge Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95 Bug: 144960427 Test: build pass Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3