tree 1d52981214b32b0f6193ff7149209d76ebcc5812
parent fb4a03c8f858a7121dfb08b77a530570fee58d34
parent 1faf15d422171832bde658a72a5b4aec36c6b646
author Jerry Zhang <zhangjerry@google.com> 1479343012 +0000
committer android-build-merger <android-build-merger@google.com> 1479343012 +0000

Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204
am: 1faf15d422

Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff