| commit | a6e2863ccbee3357775bd279361e1796175164fc | [log] [tgz] |
|---|---|---|
| author | Chet Haase <chet@google.com> | Tue Sep 21 13:49:39 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 21 13:49:39 2010 -0700 |
| tree | 6f94dd7d418200d9e8c699f069c6f7b2039d2f9f | |
| parent | 7dda67a8a18e6e06af4be6942ac95f05c6e33d08 [diff] | |
| parent | 458c1383ea0e672473feabf1852cee4dbca7211d [diff] |
am 458c1383: (-s ours) am e920477e: Merge "do not merge" into gingerbread Merge commit '458c1383ea0e672473feabf1852cee4dbca7211d' * commit '458c1383ea0e672473feabf1852cee4dbca7211d': do not merge