tree 38ed3ded493783ff579e0b235eeec3366f38e9f1
parent d325338746e2df2434b18d2f4bcf3340f477121d
parent aac40f5af734632e775ed0b5e6fff2e344008d79
author Steve Pfetsch <spfetsch@google.com> 1507162663 +0000
committer android-build-merger <android-build-merger@google.com> 1507162663 +0000

Merge "taimen: add separate charger kernel module config" into oc-mr1-dev
am: aac40f5af7

Change-Id: Ia08a85bfbc65b2699ddbbb333d2e6bdf12c0d22c