| commit | 190f3369d593d387f5d1ac07d35a9486bbfc52cd | [log] [tgz] |
|---|---|---|
| author | Teng-Hui Zhu <ztenghui@google.com> | Thu Apr 07 14:24:22 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 14:24:22 2011 -0700 |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 | |
| parent | fee8d78ce8e1177a1d1ef59f34fde2319470c07f [diff] | |
| parent | 6d692d73fdbafc6ff3174f50c1f4cee0826223a3 [diff] |
am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 * commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9': DO NOT MERGE : cherry pick of change Ieb7ae26b from master DO NOT MERGE : cherry pick of change I0f9f2c65 from master