Mark Salyzyn 2225a0640b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"

2017-01-12 15:18:26 +00:00

..

java

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

2017-01-11 22:59:25 +00:00

jni

Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"

2017-01-12 15:18:26 +00:00

res

Delete old WifiNotificationController strings.

2017-01-10 10:35:24 -08:00

tests

Merge changes I1eaab5ea,I42928da8

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