OSDN Git Service

resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp
authorVladimir Chtchetkine <vchtchetkine@google.com>
Mon, 8 Aug 2011 21:47:04 +0000 (14:47 -0700)
committerVladimir Chtchetkine <vchtchetkine@google.com>
Mon, 8 Aug 2011 21:47:04 +0000 (14:47 -0700)
commitd8ad6c98086c410243e0e8ad8285f02d6b696bd6
tree69649409778f147c482a267dd51b48c9ffad6fd7
parent3c3569d30c274c5d5ff040d3379427cea3175d06
parent988d3d7181473e36df8679368b06d0fb766c52e4
resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp

Change-Id: I85178afbca0b8b51eb3890958b063a70a1b33b96
reference-ril/reference-ril.c