Merge "Delay timer after changing voice preference" am: b569bd4953
am: d8e6a9d2de

Change-Id: I03eb269e070646849e47fee213d2935a4aedc399
tree: c88f4726ea59db0cbb009593d8e08964e9223c2d
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg