| commit | c68fa6db7fd33edc65f732d1eb571a2fb99f9c3b | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:56 2020 +0000 |
| tree | c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2 | |
| parent | 4ada375b30a41b9609604c22007eeb24e22bdb2f [diff] | |
| parent | 83ee5b1d2d1e709d8b1ae16168c2c870e859612f [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b9820803f8 am: bed0a2e094 -s ours am: 83ee5b1d2d -s ours am skip reason: Change-Id I52d6cae7d8a17ba9db10eceb8521c1232c09b992 with SHA-1 a8df54082a is in history Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1430834 Change-Id: I9883d7c49825e5f369bd8999d3f5aad627d0cf71