tree f559859a1b0ab531cfaf1c59696b6de88b092365
parent 77306ee2656fd195c44699b002d8735b79f487f1
parent d0307beeef57b9db06b82f1ffba746c5decb0b72
author Colin Cross <ccross@android.com> 1394220786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394220786 +0000

am d0307bee: Merge "charger: add locale global variable"

* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
  charger: add locale global variable