Marie Janssen 1e012d93c7 resolve merge conflicts of 1238daf to master ...

Change-Id: Icc70d291379d4f4816881e46704197513e6d548e

2016-10-26 17:57:22 -07:00

..

java/com/android/server

resolve merge conflicts of 1238daf to master

2016-10-26 17:57:22 -07:00

jni

Merge "Add timeout to usb_device_get_string to prevent usb stuck state for bad behaving devices."

2016-10-26 16:57:25 +00:00

proto

IpConnectivity metrics: add version number

2016-10-17 16:24:19 +09:00

Android.mk

Updating light service for hidl.

2016-10-12 16:14:42 -07:00