| commit | 468c60b334321d5790b0b5bd962870939aac0ab2 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Fri Aug 30 14:06:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 30 14:06:47 2013 -0700 |
| tree | d7530853b4831789a7ce953ccf323c2eb811fab3 | |
| parent | ee9d38ff24358774d194108128e99f09d08ddf8e [diff] | |
| parent | 00e4c6721b344eca1d8b0de0e82e5de6f4f21f16 [diff] |
am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev * commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16': Telephony: SMS over IMS, DO NOT MERGE