| commit | 5910edcd70fffad4bf8e3fdd7ab9fc029451985b | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Mon Jan 25 23:34:43 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 23:34:43 2010 -0800 |
| tree | a24c36a2e6003776f44f9fc23f17614e92202080 | |
| parent | cf1c1790ae23d2a37b44f512e7351855e264f9ee [diff] | |
| parent | 8fa17c4f225590d9dbe59b813a5054a506b3f19c [diff] |
am 8fa17c4f: (-s ours) am 79f107bd: Do not merge Merge commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c' * commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c': Do not merge