| commit | 1ce21b999e8c45ed2d5055db4be83a9d7c2eddba | [log] [tgz] |
|---|---|---|
| author | Teng-Hui Zhu <ztenghui@google.com> | Thu Apr 07 14:27:03 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 14:27:03 2011 -0700 |
| tree | 6446fdfd35230a7bd1987c3681f0f6b09751d380 | |
| parent | f837358fc46c2e680e44b8b12d03bdecf98a642c [diff] | |
| parent | 190f3369d593d387f5d1ac07d35a9486bbfc52cd [diff] |
am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 * commit '4e790ee1894118a1ab2032d09e5016fa9414dae7': DO NOT MERGE : cherry pick of change Ieb7ae26b from master DO NOT MERGE : cherry pick of change I0f9f2c65 from master