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