| commit | 56385ed9f834a7cc2a094a260dfe5a430514bec7 | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Fri Nov 22 09:05:29 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 22 09:05:29 2019 +0000 |
| tree | 907ab2f282933671036a3fae40c8adcc2512b8c7 | |
| parent | 6c9b9f41d6bcbb03d2450c9b6260114a03ef8e15 [diff] | |
| parent | 821a1259e717d014daabe5d9cf34997313b2ad04 [diff] |
Merge "[Settings] Fix conflict of AOSP merge"