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


Trivial merge