Tyler Gunn 6fe9d51f7a resolved conflicts for merge of bbd854e2 to master ...

Change-Id: I87a83d304c3d01aa8fafc581d114bb7801f594c3

2015-08-20 12:44:04 -07:00

..

android/telephony

resolved conflicts for merge of bbd854e2 to master

2015-08-20 12:44:04 -07:00

com/android

am 499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev

2015-07-29 22:46:16 +00:00