OSDN Git Service

am 89aa0ebf: (-s ours) Ignore 0c3d5d95 from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Fri, 10 Dec 2010 16:59:14 +0000 (08:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Dec 2010 16:59:14 +0000 (08:59 -0800)
* commit '89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
  2.3.1


Trivial merge