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