Andreas Gampe 87fcf18ac7 Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev ...

am: 2437f9f10c

Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec

2017-09-15 02:34:44 +00:00

..

java/com/android/server

Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev

2017-09-15 02:34:44 +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