| commit | 11905ca038bca2255f13ba4953b889ceb39c03ba | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Tue May 18 18:46:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 18:46:45 2010 -0700 |
| tree | 25d44cb08bdbcfd4884384b69c7aa831d3e2f7e3 | |
| parent | 899001748ebc0e390fe173ac3e689e3b625500b2 [diff] | |
| parent | cac3e5803d4d056baea4f4477fbc7a1bca461f65 [diff] |
am cac3e580: (-s ours) am 18b75566: Squashed commit of the following (DO NOT MERGE):