tree c2d2c423b7f9b28a306c3f89aef6e60e0aaf9bc2
parent ab453cd56532391aa4fcfb874a672a916b925637
parent 37b939a1807b2fa2b16fc1f0c3a4123850b7fb6f
author Badhri Jagan Sridharan <badhri@google.com> 1487189633 +0000
committer android-build-merger <android-build-merger@google.com> 1487189633 +0000

Merge changes from topic 'dual_role_chargers'
am: 37b939a180

Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af