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

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