commit | 7c662f375b2761eca1068a5d373921783e7dcc3c | [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 | 60e01d1b54244b5da6a07286d5794b6fb7346442 | |
parent | eb33dbcd4bc32722a8965725fe42f9a0df828783 [diff] | |
parent | 03ec8722774ff879414e0026101ffc9557a8b2db [diff] |
am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4' * commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4': DO NOT MERGE