Merge "Rewrite the power measurement retry loop" am: e6e7030c75 am: a5f9a0d432 am: 9661b3f65d am: 48455dd540
am: e2e8ad1355

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