OSDN Git Service

am 60d10ec9: (-s ours) Merge from gingerbread - do not merge
authorLorenzo Colitti <lorenzo@google.com>
Tue, 3 May 2011 18:22:03 +0000 (11:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 May 2011 18:22:03 +0000 (11:22 -0700)
commit8dbc643bbc65d89c1fac69f09d02d8ff12b008fb
treec503e08c3f15649c0ffa25b9043ab86f7e68c505
parent08929fd6715b2b6a02f25b23704923d98c15a3b9
parent60d10ec91aa9de6b4699a87557ba8f041bf34be3
am 60d10ec9: (-s ours) Merge from gingerbread - do not merge

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