| commit | ef3018ccab970cd6d64b761f405d08ec74a0d124 | [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 | 8557c1134dc22cdc0f2f96f8b7c5be00398146d5 | |
| parent | 2bff83930d9575f0bd08da72385fdbfd97b9a1b8 [diff] | |
| parent | 8bd41ac175f8e254d67d31cf020932e4f02d00c5 [diff] |
am 8bd41ac1: (-s ours) Merge "Fix typo in manual merge" into gingerbread-plus-aosp * commit '8bd41ac175f8e254d67d31cf020932e4f02d00c5': Fix typo in manual merge