OSDN Git Service

am d0bc13e1: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge
authorLorenzo Colitti <lorenzo@google.com>
Mon, 2 May 2011 19:20:24 +0000 (12:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 May 2011 19:20:24 +0000 (12:20 -0700)
commit04753f4bb3abbcca2e78545c3c08fd230fb55383
tree3bfa8be5b0bd6d151c4cec29c7cbfd802d4b96d7
parente70d0c9c1b85a233608d85433a8dfc5dcb8441c9
parentd0bc13e161401f92c73fa6ba0d4e525b30dac4c8
am d0bc13e1: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge

* commit 'd0bc13e161401f92c73fa6ba0d4e525b30dac4c8':
  Port RIL v4 to gingerbread from master.