| commit | bb55777be1a3231d187205dc378ca35b01e8bc65 | [log] [tgz] |
|---|---|---|
| author | Teng-Hui Zhu <ztenghui@google.com> | Thu Apr 07 14:17:52 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 07 14:17:52 2011 -0700 |
| tree | cf386819e46edbbf719a41e7b982907a0bc420be | |
| parent | 515a08b01851a1ab9386f85dee6d9fd7b65ee7ad [diff] | |
| parent | 2fcf82aee30da977849adaaadf89d81c17afbac2 [diff] |
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 * changes: DO NOT MERGE : cherry pick of change Ieb7ae26b from master DO NOT MERGE : cherry pick of change I0f9f2c65 from master