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)
* commit 'd0bc13e161401f92c73fa6ba0d4e525b30dac4c8':
  Port RIL v4 to gingerbread from master.


Trivial merge