| commit | a46dbb02704c50bcff83f327563d2690a6628930 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:54 2020 +0000 |
| tree | fa202f48c5fb651c43f321c749c4a2268d170bc9 | |
| parent | a7c6600b14928cc66888c160de2686aaddaf313e [diff] | |
| parent | 02849cb64d0944445d55706f8da804ab25b8a7b4 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 02849cb64d -s ours am skip reason: Change-Id I6c46fd6b04afb29e8173dcc9e8677bd73d362908 with SHA-1 a7c6600b14 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/12579278 Change-Id: Ica89dc1c112fdb6d26ee59355ed06ce32c6e7d40