tree 5437d57daa10827aa720fc2aaa00406715e50e6c
parent 365d843010d250bea75cdb038029d06d014ccc05
parent 5085848ddbadaafa088ed85753156adc2e54554d
author Jean-Baptiste Queru <jbq@google.com> 1282056711 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282056711 -0700

am 5085848d: am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"

Merge commit '5085848ddbadaafa088ed85753156adc2e54554d'

* commit '5085848ddbadaafa088ed85753156adc2e54554d':
  Make the LED colors when charging customizable by the vendor