[automerger skipped] Merge "Revert "Wifi usability:Change the unit of the threshold for tx/rx throughput from Mbps to Kbps"" into qt-qpr1-dev am: fd50d92375
am: 4e20e4358d -s ours
am skip reason: change_id I76d6338cd2d482d198fde1e5a2d1a0540c087ca6 with SHA1 83d69b5e03 is in history

Change-Id: I3f6cf0f6e82a22461c28d7bac9ed529fa283d320
tree: ce7392f2521cb177506154c27c59369ba8bbe20b
  1. service/
  2. PREUPLOAD.cfg