tree 790bf61551e68ee621ce3c9c4c9d47cf15129203
parent 6efb03799b37eb47f849b1f644e7413c5e426d73
parent 0d56170d4b86c17f351daef254e19a5fcfd97a1c
author Xin Li <delphij@google.com> 1602217070 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602217070 +0000

[automerger skipped] Skip ab/6749736 in stage. am: d57626304f -s ours am: 0d56170d4b -s ours

am skip reason: Change-Id I122d1acaca1d3895d02d18f2221a3af636476d65 with SHA-1 16c2d8bfc7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/12797483

Change-Id: I61f4f97a135b1ba8a7c116d9f944839d5585e52f