| commit | 03d7ffc1c8f84773af94abc6fbeb1f631e993c17 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 02 17:56:13 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 02 17:56:13 2011 +0000 |
| tree | 4391868d184c17689d8fc5a13e97fa5bd60b3594 | |
| parent | 0382934575ad1b915a8edba83292d2e9eccb8049 [diff] | |
| parent | 0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce [diff] |
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"