Yifan Hong 860ef8810d Merge "BpBase -> BpHwBase" am: d8384b5c15 ...

am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e

2017-01-12 02:08:36 +00:00

..

java

Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13

2017-01-11 23:17:19 +00:00

jni

Merge "BpBase -> BpHwBase" am: d8384b5c15

2017-01-12 02:08:36 +00:00

res

Merge "Delete old WifiNotificationController strings." am: 6daef4499f

2017-01-11 02:24:26 +00:00

tests

Merge changes I1eaab5ea,I42928da8

2017-01-11 01:02:05 +00:00