commit | 0f80eb24e5ef0a3e1a4128afab17bc20b334c2fe | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 04 14:59:38 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 14:59:38 2011 +0000 |
tree | 6c8bb7914fe21485e5cdf17f870bb1ba0078c966 | |
parent | fe6c59489cbac15ddd3b68115cd872c06365096c [diff] | |
parent | 99436ca879c7ec32fda845559fcb038001619dae [diff] |
am 99436ca8: am 6182d031: Reconcile with ics-factoryrom-2-release * commit '99436ca879c7ec32fda845559fcb038001619dae': 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"