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

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