Nicolas Geoffray 61dc6ffcbd Merge "Special handling of priv-apps in PMS." am: 107899c599 am: 15b0493360 ...

am: 35455f2553

Change-Id: I8bfe46aad8166d4d4b7346fe10f3e148a34ccf0b

2017-09-26 12:46:30 +00:00

..

java/com/android/server

Merge "Special handling of priv-apps in PMS." am: 107899c599 am: 15b0493360

2017-09-26 12:46:30 +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