[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s ours am: 363cfd986c -s ours

am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883

Change-Id: Ia5329d7dd5a92d85dfd4b8a186319333884ffe2b
tree: f5cba6c87549b8ba320653ae13c7884f7dca1e96
  1. oem_template/
  2. src/
  3. testing/
  4. Android.bp
  5. Android.mk
  6. OWNERS
  7. proguard.cfg
  8. README