| commit | 8b1373fbed9adfd16eb6427e328261a2accf4a41 | [log] [tgz] |
|---|---|---|
| author | Shimeng (Simon) Wang <swang@google.com> | Mon Oct 18 08:04:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 18 08:04:08 2010 -0700 |
| tree | 7706bf26d19340c873c80667789120d69e1fad54 | |
| parent | e8aa954e46d002ae89fcfc307956312721b41b5f [diff] | |
| parent | d687504e73b9d4a41b7ba28de864b4f3ab5c48e4 [diff] |
am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4' * commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4': DO NOT MERGE