Erik Kline 8d3efa6722 Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev ...

am: ab10e1a7db

Change-Id: I9121798bba0be9dcdf1e45d39c092020620fa53b

2017-10-11 01:43:00 +00:00

..

java/com/android/server

Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev

2017-10-11 01:43:00 +00:00

jni

Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev

2017-09-14 18:33:47 +00:00

Android.mk

Merge "Switch tethering stats from the unix socket to binder."

2017-09-05 09:26:26 +00:00