[automerger skipped] Add functionality to hi-perf WifiLocks am: 29728494c6 am: c211abec88
am: 1a4fe6d456 -s ours
am skip reason: change_id I5d68c0376b69f9726b83fd56469e5d397845dd8d with SHA1 0e6ca0e44a is in history

Change-Id: I7fe721b5da7b7544e8a87626203dcf0c37251703
tree: ccd1ee99c43e04b7d8e437993da3ed2527023013
  1. service/
  2. PREUPLOAD.cfg