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

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