Jean-Baptiste Queru 1ace4163fa resolved conflicts for merge of ff749b9a to master ...

Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af

2010-08-30 14:00:27 -07:00

..

android/telephony

am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

2010-08-24 10:16:42 -07:00

com/android/internal/telephony

resolved conflicts for merge of ff749b9a to master

2010-08-30 14:00:27 -07:00