| commit | cf1c1790ae23d2a37b44f512e7351855e264f9ee | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Mon Jan 25 18:11:52 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 18:11:52 2010 -0800 |
| tree | a24c36a2e6003776f44f9fc23f17614e92202080 | |
| parent | 11e71b1d376c5c41baf24f737b56b82d0e814988 [diff] | |
| parent | 15eb5b562b10f293bc5de162075895b54400f684 [diff] |
am 15eb5b56: (-s ours) am 474429d0: Do not merge Merge commit '15eb5b562b10f293bc5de162075895b54400f684' * commit '15eb5b562b10f293bc5de162075895b54400f684': Do not merge