Merge "Merge "Minor fix due to the auto-wifi feature" am: 74b286b79f am: fd5d58da52" into pi-dev
tree: d41457a3104be3582c8aee1795dddf2cbc17c052
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg