tree 796a914d3c360e92ff51e2eca927740570c3f40e
parent d8e0108418a777edcb9e1c3452866db62e1ba5ab
parent a9028879707d58f286014c4a6a9c6b53f61c2806
author Elliott Hughes <enh@google.com> 1454553319 +0000
committer android-build-merger <android-build-merger@google.com> 1454553319 +0000

Merge "Add support for USB_HVDCP chargers" am: ba3014c914
am: a902887970

* commit 'a9028879707d58f286014c4a6a9c6b53f61c2806':
  Add support for USB_HVDCP chargers