Merge "Fix for device setup pairing inconsistency" into pi-dev
tree: 02bc9af56c989fe76f257d1348c251a0cfee7daf
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg