commit | c25a9f3633d5134bab24ad3d70f66bc04a487831 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 16:42:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:42:02 2020 +0000 |
tree | 89f1bbcbb829bf03cd13b53e744aa7c4c63c2724 | |
parent | 78a2ddcd4990ee43ef7da2fffc50ebd343baa6d8 [diff] | |
parent | e4160e4d2b19dded3196f4baa0f830591f7a393a [diff] |
[automerger skipped] Merge QQ3A.200605.002 into master am: 3472311082 -s ours am: 5b86496a10 -s ours am: 9c264680cc -s ours am: e4160e4d2b -s ours am skip reason: Change-Id Ica1e1d90f13d4195ec2eb62ed2255f5b741e048c with SHA-1 fe695d4001 is in history Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1323274 Change-Id: I0eecbb38e81f16880d5e4b0dad66b22139695059