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"
This commit is contained in:
The Android Open Source Project 2011-11-02 17:56:45 +00:00 committed by Android Git Automerger
commit fdb8247ee9

Diff Content Not Available