| commit | fe6c59489cbac15ddd3b68115cd872c06365096c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 02 17:58:59 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 02 17:58:59 2011 +0000 |
| tree | 6c8bb7914fe21485e5cdf17f870bb1ba0078c966 | |
| parent | 06f3a51d8ba647bdf9f2db145d0e2d931bb4fb84 [diff] | |
| parent | 03d7ffc1c8f84773af94abc6fbeb1f631e993c17 [diff] |
am 03d7ffc1: am 0e4d9eb8: Reconcile with ics-factoryrom-2-release * commit '03d7ffc1c8f84773af94abc6fbeb1f631e993c17': 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"