Merge "Stop using private API in Wifi Aware." am: a535e93e36

Change-Id: I537b562581669096d88bf5bce4dbf8e5c9b6aa5c
tree: d4f3831a0ebda03f78a34d7ed55db9bdc05f236c
  1. service/
  2. PREUPLOAD.cfg