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)
commitb08914475e4e94d8390996d54d87f905979238d8
tree2396d55f8e1a2e9bee1f67af09c36d7bf70a583f
parentd0bc13e161401f92c73fa6ba0d4e525b30dac4c8
parent8dbc643bbc65d89c1fac69f09d02d8ff12b008fb
am 8dbc643b: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge

* commit '8dbc643bbc65d89c1fac69f09d02d8ff12b008fb':