| commit | 0b8fee520d9708de981238ce8391782b5dac2b71 | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Fri Jul 30 13:50:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 13:50:03 2010 -0700 |
| tree | 937313fda616ad0d7f1ce6a3db08f422bf2ea1c2 | |
| parent | 9af41be99bcd7d56a80f833c3474f3553afe8240 [diff] | |
| parent | 8414dc0c4854b110e2b7ea69ef177b08aaecbe70 [diff] |
am 903d445f: (-s ours) am 131ce67d: Merge "DO NOT MERGE" into gingerbread Merge commit '903d445f4102f3ae15e370bd10e1745a88905a99' * commit '903d445f4102f3ae15e370bd10e1745a88905a99': DO NOT MERGE