Merge "Merge "Delay timer after changing voice preference" am: b569bd4953 am: d8e6a9d2de" into pi-dev-plus-aosp
am: d9ce24fcde

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