[automerger skipped] Merge "Switch settings to use Time[|Zone]Detector" am: 4e6c48356e -s ours am: 1a8830cb9c -s ours
am skip reason: Change-Id I9546a4823703c5c35c415e5bbd9bfc352d2a271b with SHA-1 c86c221031 is in history

Change-Id: I0ede4d99d37cd76fb68276d63dc21567970aec7f
tree: 2926992a7900d86fcd3c68b1188a4c163c57f211
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg