| commit | 825e28c6c5c312c08f44b71400f987b6bd66e103 | [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 | cd17f77bf1022f1dd132aecd6d13aa604b89e3c6 | |
| parent | 9c461c6ea5c254e1e79381ba076a07b067329e81 [diff] | |
| parent | 4e790ee1894118a1ab2032d09e5016fa9414dae7 [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