OSDN Git Service

am 8dbc643b: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge
authorLorenzo Colitti <lorenzo@google.com>
Tue, 3 May 2011 23:14:58 +0000 (16:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 May 2011 23:14:58 +0000 (16:14 -0700)
* commit '8dbc643bbc65d89c1fac69f09d02d8ff12b008fb':


Trivial merge