Marie Janssen ff0d3e1c8d Merge "Bluetooth: fix issues re-enabling after crash" ...

am: e2c22e38d5

Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded

2016-12-16 23:07:42 +00:00

..

java/com/android/server

Merge "Bluetooth: fix issues re-enabling after crash"

2016-12-16 23:07:42 +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