| commit | 058a27ad83598d363f0df53f798a3a25ac4f8e1f | [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 | 25d414048817d4a815150609c0ee56b358a0b4bb | |
| parent | 998056d2d3111a5200faedbff04c60ecfc7ae981 [diff] | |
| parent | a766851582ab3cc57770f246892f049b1f165579 [diff] |
am 458c1383: (-s ours) am e920477e: Merge "do not merge" into gingerbread Merge commit '458c1383ea0e672473feabf1852cee4dbca7211d' * commit '458c1383ea0e672473feabf1852cee4dbca7211d': do not merge