| commit | 29fa50be2484ed9d7a5e8075b764caa37b6494b9 | [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 | c31232e45dfd65f13624973628ef278a718bad41 | |
| parent | 96ac85607b1462508981936b1be29ae5f9e4271d [diff] | |
| parent | bb55777be1a3231d187205dc378ca35b01e8bc65 [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