| commit | 94023fa6744e24f26f0aba1699ec278649bd66df | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 20 13:11:53 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 20 13:11:53 2011 -0800 |
| tree | a0184b1a6a55a924143411129a4cd13d9dbcaa08 | |
| parent | 12d9702773c8a3242a44dd6528126c9ff0dade43 [diff] | |
| parent | 183c525aee3b683f6d92b0b6e7197a3989ddee1a [diff] |
am 21cb1290: Reconcile with ics-mr1-release * commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':