tree 073504bb9f98276d0e064b52609c85103196853b
parent 78ae5ebe584ce68da0027653ee982167c88d82d9
parent 7cee8be675dbda459c2f2afec96a991410d03399
author Philip P. Moltmann <moltmann@google.com> 1470343120 +0000
committer android-build-merger <android-build-merger@google.com> 1470343120 +0000

Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev
am: 7cee8be675

Change-Id: Ie34e32f66df546619ff6c5553223d53d68e491c7