OSDN Git Service

am 60d10ec9: (-s ours) Merge from gingerbread - do not merge
authorLorenzo Colitti <lorenzo@google.com>
Mon, 2 May 2011 19:12:00 +0000 (12:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 May 2011 19:12:00 +0000 (12:12 -0700)
commitd0bc13e161401f92c73fa6ba0d4e525b30dac4c8
tree2396d55f8e1a2e9bee1f67af09c36d7bf70a583f
parented82b9aea44672386bafe208cf6bf540e95f21f3
parent60d10ec91aa9de6b4699a87557ba8f041bf34be3
am 60d10ec9: (-s ours) Merge from gingerbread - do not merge

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