commit | c763809c1e55595e3a453a5d00f00698d3e53967 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:59 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:59 2020 +0000 |
tree | fa202f48c5fb651c43f321c749c4a2268d170bc9 | |
parent | 30c5b0437e28f03740e66b7bbb7d7635c26adf89 [diff] | |
parent | 72dad724177645cde83f50255c5d1fea021eaae7 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9c28d5e5f6 am: 6f3ccca004 -s ours am: 72dad72417 -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: Iadaaeb05a02fb8ffde527ef6f96870b60eb1f673