commit | e04b251b758188ae390b1d29f3e07942b9fb70a7 | [log] [tgz] |
---|---|---|
author | Shimeng (Simon) Wang <swang@google.com> | Fri Oct 15 18:25:25 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 18:25:25 2010 -0700 |
tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 | |
parent | 3fcc33a1f8d6f892f8ea1f46813ee7d5e7464a6e [diff] | |
parent | fbccbe1d1670df6ae4bb3d0f7d686ad8802479e7 [diff] |
am 7ef6834e: Merge "DO NOT MERGE" into gingerbread Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp * commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7': DO NOT MERGE