OSDN Git Service

am 468c60b3: (-s ours) am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS,...
authorEd Tam <etam@google.com>
Sat, 31 Aug 2013 01:14:59 +0000 (18:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Aug 2013 01:14:59 +0000 (18:14 -0700)
commit0f1691e4c5412bd7139aff00feeb543b9adc47e9
treed4264819b0dd5dd9f410fced337a35732c30cc83
parentbc7e4b2cd5a7068fbcd9de8eb0e2e7a9f596479b
parent468c60b334321d5790b0b5bd962870939aac0ab2
am 468c60b3: (-s ours) am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit '468c60b334321d5790b0b5bd962870939aac0ab2':
  Telephony: SMS over IMS, DO NOT MERGE