Commit 03d7ffc1 authored Nov 02, 2011 by The Android Open Source Project Committed by Android Git Automerger Nov 02, 2011

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

* commit '0e4d9eb8':
  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"

parents 03829345 0e4d9eb8

There are no changes