OSDN Git Service

am f50b9c4c: resolved conflicts for merge of 24297cab to gingerbread-plus-aosp
authorEd Heyl <ed@google.com>
Tue, 8 Mar 2011 22:28:26 +0000 (14:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Mar 2011 22:28:26 +0000 (14:28 -0800)
commit122b3d196beee18363309fef803389f5b8db7f40
treeb592c42fcf049c12a6b0ec92d4b80c33d5cdc1b9
parent1c908fa1889d82fd58548c6f0aba0676f3d7b7c8
parentf50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1
am f50b9c4c: resolved conflicts for merge of 24297cab to gingerbread-plus-aosp

* commit 'f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1':
  version bump for new release   (please don't merge)