| commit | 33789dd08c1709ab1015dc09b0a62ea217f3a1a0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
| tree | 7a2428544dd7ce1789d3968a080b6b0c6d6cf695 | |
| parent | 83b1fc9643ab84b20915f8e90cff436050772164 [diff] | |
| parent | c1cf0488dca56d76b6351935785fe464c1186d65 [diff] |
am c1cf0488: Reconcile with ics-mr1-release * commit 'c1cf0488dca56d76b6351935785fe464c1186d65':