commit | 9c264680cc2afb3f086d4f42e448072d8671dd23 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 16:08:00 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:08:00 2020 +0000 |
tree | 89f1bbcbb829bf03cd13b53e744aa7c4c63c2724 | |
parent | d2113feefe27d270e6240464d58fc8bf6776da63 [diff] | |
parent | 5b86496a100260660f2a52f2f0c6c72e54de0f7c [diff] |
[automerger skipped] Merge QQ3A.200605.002 into master am: 3472311082 -s ours am: 5b86496a10 -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: Iecfce673e53f34312e7265ba546fcc490fbf97a0