Jason Chen bdf11be97b Revert "resolved conflicts for merge of 8788d140 to master" ...

This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.

2010-10-01 22:49:42 -07:00

..

android/telephony

am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

2010-09-15 12:19:05 -07:00

com/android/internal/telephony

Revert "resolved conflicts for merge of 8788d140 to master"

2010-10-01 22:49:42 -07:00