OSDN Git Service

Merge from gingerbread - do not merge
authorLorenzo Colitti <lorenzo@google.com>
Mon, 2 May 2011 16:43:05 +0000 (09:43 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 2 May 2011 17:09:48 +0000 (10:09 -0700)
commit60d10ec91aa9de6b4699a87557ba8f041bf34be3
treea9e84dc34172328627c5a93ce6068306e603cdff
parent08929fd6715b2b6a02f25b23704923d98c15a3b9
parent3b1530aef62476248825a2092c9aea800395c3b1
Merge from gingerbread - do not merge

Change-Id: I3529a5f85d93e66aa5fca62ac44c242c4f7e163d
include/telephony/ril.h