OSDN Git Service

am b0891447: (-s ours) am 8dbc643b: (-s ours) am 60d10ec9: (-s ours) Merge from ginge...
authorLorenzo Colitti <lorenzo@google.com>
Tue, 3 May 2011 23:20:11 +0000 (16:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 May 2011 23:20:11 +0000 (16:20 -0700)
* commit 'b08914475e4e94d8390996d54d87f905979238d8':


Trivial merge