[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 03eb7b23c6 -s ours am: 871f34530a -s ours

am skip reason: Merged-In I9982c8c04024f016e8ef27d0e35d8d3eaff72f0f with SHA-1 d74609fdcc is already in history

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

Change-Id: I70ff56acc29eeee340f6470a1ef23c85dcf6fedf
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