tree b592c42fcf049c12a6b0ec92d4b80c33d5cdc1b9
parent 1c908fa1889d82fd58548c6f0aba0676f3d7b7c8
parent 122b3d196beee18363309fef803389f5b8db7f40
author Ed Heyl <ed@google.com> 1299638422 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299638422 -0800

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)