Makoto Onuki aeb3751559 resolved conflicts for merge of 9cd8c711 to master ...

Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828

2012-11-30 10:05:20 -08:00

..

android/telephony

Use Rlog instead of Log

2012-11-27 12:29:13 -08:00

com/android/internal/telephony

resolved conflicts for merge of 9cd8c711 to master

2012-11-30 10:05:20 -08:00