tree 7bf222ee67884fa9ff6338c5acf6773e8961be77
parent d80ba8abc812778a0c7e2042a1f2ffa87f25cb60
parent ac0bb1f7b27c4ae95c99900156675080b767cce2
author Badhri Jagan Sridharan <badhri@google.com> 1487195357 +0000
committer android-build-merger <android-build-merger@google.com> 1487195357 +0000

Merge changes from topic 'dual_role_chargers' am: 37b939a180 am: 0a3efc2622 am: d4a847495e
am: ac0bb1f7b2

Change-Id: I9647bbeea800b9e7d73748474f8c5bb83620df39