| commit | 7075cd32456dfb347f1fc2132eed47aa56c623b8 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Mon Nov 08 20:43:03 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 08 20:43:03 2010 -0800 |
| tree | a70022457dcbf54c8116488b7b9df1ad9c22c859 | |
| parent | e252c638fdb1c8e4878493c7a84317ca9bbecb31 [diff] | |
| parent | 6dd94880ef0ee76bb462138ea1fcc867b45dc231 [diff] |
am 8bd41ac1: (-s ours) Merge "Fix typo in manual merge" into gingerbread-plus-aosp * commit '8bd41ac175f8e254d67d31cf020932e4f02d00c5': Fix typo in manual merge