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"
This commit is contained in:
The Android Open Source Project 2011-11-04 14:59:34 +00:00 committed by Android Git Automerger
commit 02ab0f6715

Diff Content Not Available