Merge "Rewrite the power measurement retry loop" am: e6e7030c75
am: a5f9a0d432

Change-Id: I4167b2cb33ff9da36753c32a47c7b9ce7db6e4bd
tree: 6f78983ff379cc8ccf5f60c25d5da2edb3cdf3e3
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg