| commit | 51b8edb5173e84eb54fd5f7ad34fc0f67c31f5cf | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Tue Mar 08 18:40:22 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 08 18:40:22 2011 -0800 |
| tree | b592c42fcf049c12a6b0ec92d4b80c33d5cdc1b9 | |
| parent | 1c908fa1889d82fd58548c6f0aba0676f3d7b7c8 [diff] | |
| parent | 122b3d196beee18363309fef803389f5b8db7f40 [diff] |
am 122b3d19: (-s ours) am f50b9c4c: resolved conflicts for merge of 24297cab to gingerbread-plus-aosp * commit '122b3d196beee18363309fef803389f5b8db7f40': version bump for new release (please don't merge)