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)
* commit 'f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1':
  version bump for new release   (please don't merge)


Trivial merge