Jerry Zhang 29b3cfa21d Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp ...

am: 54c6447f47

Change-Id: I13aeac421ecf7a54f16e0fd6aaa19be3f513be4a

2017-08-24 23:10:06 +00:00

..

java/com/android/server/usb

Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp

2017-08-24 23:10:06 +00:00

Android.mk

Prevent multiple copies of android.hidl.manager-V1.0-java

2017-05-10 07:27:24 -07:00