| commit | d687504e73b9d4a41b7ba28de864b4f3ab5c48e4 | [log] [tgz] |
|---|---|---|
| author | Shimeng (Simon) Wang <swang@google.com> | Fri Oct 15 18:24:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 18:24:06 2010 -0700 |
| tree | dd8f7ac56a0c0d5a0d7cbf8cc1bf756c83666b21 | |
| parent | 46ca6a2289e2de9d5a0638c962da0717c51520d3 [diff] | |
| parent | 31e4d66ada01ea0714304309967a38d07bfce6c6 [diff] |
am 31e4d66a: Merge "DO NOT MERGE" into gingerbread Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp * commit '31e4d66ada01ea0714304309967a38d07bfce6c6': DO NOT MERGE