tree f3e912b0c12a0524ea417ee21502e76c5616aba0
parent 5cbd151d401b28ee33cf7405f5d56b12a15dc9fe
parent b37d826204025ea9b33d8d733e1282a5e1eb0822
author Jerry Zhang <zhangjerry@google.com> 1479342179 +0000
committer android-build-merger <android-build-merger@google.com> 1479342179 +0000

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

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366