tree 4391868d184c17689d8fc5a13e97fa5bd60b3594
parent 03d7ffc1c8f84773af94abc6fbeb1f631e993c17
parent 6182d031d7a1968c2edc8862bb5a9bc5bc8922e9
author The Android Open Source Project <initial-contribution@android.com> 1320418707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320418707 +0000

am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"