Merge "Fix bugs for data detection on wifi case"
am: 6e8fefda99

Change-Id: Icc821bc32189982ce50938138e8ec465179b0417
tree: 92f745047a65693300e4f2d91316c4e7b6792dc9
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg