Amit Mahajan dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 ...

* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator

2014-10-07 05:12:44 +00:00

..

android/telephony

am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

2014-10-02 21:48:20 +00:00

com/android

Merge commit '69555fc2' into fix-merge-conflict3

2014-10-06 21:57:42 -07:00