Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6ecc274e5 -s ours am: f2fe4db511 -s ours am: d52692a1c2 -s ours" into tm-d1-dev-plus-aosp am: 07655f37de -s ours am: 450e68ddac -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/19383107

Change-Id: Ic1a8d56cb20df94367cba06f5f13a2c8801ed4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 1664b2924e4da9b8c639ec84eab20bc68569e38e
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties