Merge "Merge "Test script change for better reliability" am: 627603416e" into oc-dev am: 99c4354b09
am: 08ad631576

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