[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: c52c0843a0 -s ours am: a613dbd8c7 -s ours

am skip reason: Merged-In I62f7f67a376a5a3382b2cddf584a884652009ee0 with SHA-1 dd6765f4ca is already in history

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

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