| commit | 8ae9a394ff96262331544bf809c9f39374e73818 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 01 09:09:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 01 09:09:15 2012 -0800 |
| tree | 21ae42a0dd01b9951fa1684b05ed68b7a18bcb3b | |
| parent | efdeade603f9a93286485b430636be1b92044b71 [diff] | |
| parent | 25e728d25e2a76e156937e41454adabc4facabad [diff] |
am 25e728d2: Reconcile with ics-mr1-release * commit '25e728d25e2a76e156937e41454adabc4facabad':