Merge "Merge "Delay timer after changing voice preference" am: b569bd4953" into stage-aosp-master am: 2853d7b57d
am: 7340d73ba3

Change-Id: I9f94fbc75c23ac0ccb23952d5428cda9f63b67f9
tree: 9ee0bab6e765de738e82b8fb269a2f84df03c90f
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg