Merge "Switch settings to use Time[|Zone]Detector" into stage-aosp-master
tree: ee6caf3e8156592d9b32946cce0a319225fbce20
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg