tree 12781a96fb713cb9b71a8c2eed60712e8e5714bf
parent af0a8b2a90e11edb0c9697323e4cac94b0f30209
parent 0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce
author The Android Open Source Project <initial-contribution@android.com> 1320256605 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320256605 +0000

am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
  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"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"