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

am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966

2017-01-12 15:32:50 +00:00

..

java

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

2017-01-11 23:12:16 +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:32:50 +00:00

res

Merge "Delete old WifiNotificationController strings."

2017-01-11 02:20:14 +00:00

tests

Merge changes I1eaab5ea,I42928da8

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