| commit | 02ab0f6715f85072fd69e856a26a1f345f954b37 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 04 14:59:34 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 14:59:34 2011 +0000 |
| tree | 12781a96fb713cb9b71a8c2eed60712e8e5714bf | |
| parent | fdb8247ee99e081f8f6f95cf5b2c6e094968a83c [diff] | |
| parent | 6182d031d7a1968c2edc8862bb5a9bc5bc8922e9 [diff] |
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"