Jeremy Joslin 4150ec18e9 Merge "Update registerNetworkScoreCache() to accept a filter type." ...

am: a511a07fa3

Change-Id: I51983da8fe63db15d9b38e3ebe4a20cb95cb5f13

2016-12-10 00:06:37 +00:00

..

java/com/android/server

Merge "Update registerNetworkScoreCache() to accept a filter type."

2016-12-10 00:06:37 +00:00

jni

Merge "Remove static link in Android framework under /frameworks/base."

2016-12-02 19:35:03 +00:00

proto

DO NOT MERGE: IpConnectivity metrics: add version number

2016-12-09 11:21:11 +09:00

Android.mk

Merge "Initial Binder interface for installd."

2016-12-06 00:23:56 +00:00