| commit | 0e2a0c53cb66d308ff37e61c3b5f7a2cee67a6ad | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:59 2020 +0000 |
| tree | fa202f48c5fb651c43f321c749c4a2268d170bc9 | |
| parent | 2274bfbce5718dac411baaf2c1d6bbb0cb1cbf10 [diff] | |
| parent | a9f4f167f4011569dcc522510f647d45ec44116c [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: b74237e57d am: e5bab02dd5 -s ours am: 884f215af0 -s ours am: a9f4f167f4 -s ours am skip reason: Change-Id Ica89dc1c112fdb6d26ee59355ed06ce32c6e7d40 with SHA-1 a46dbb0270 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/1431518 Change-Id: I4fe927a0bdfa1730b5f758c5e92be6b907a2fad4