Merge "Delay timer after changing voice preference"
tree: c6038de89adb4259b991934c05b892eb22b0f24e
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg