| commit | 32407e615bbacb6bf21161a4d95a77961a411e81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 01 10:01:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 01 10:01:28 2012 -0800 |
| tree | 5ba296626804105462f165ad3453b0e47e1036ee | |
| parent | 2577fca158ee8cd7162c3550b465cab73b0a7dbc [diff] | |
| parent | 1b841f56aba672ba938708835aa032ecb126d729 [diff] |
am 1b841f56: Reconcile with ics-mr1-release * commit '1b841f56aba672ba938708835aa032ecb126d729':