Jean-Baptiste Queru db71bda6f6 Merge from gingerbread ...

Change-Id: I6b895012db6b96666dc3257b1f2e430925981188

2011-02-03 14:25:38 -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 14:25:38 -08:00