Jean-Baptiste Queru 4b8ad9effd Merge from gingerbread ...

Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c

2011-02-03 13:17:49 -08:00

..

android/telephony

resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp

2010-11-22 16:32:34 -08:00

com/android/internal/telephony

Merge from gingerbread

2011-02-03 13:17:49 -08:00