| commit | c313c441b5f7c0aacb1261d8abf776a80381cfba | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Oct 24 23:03:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 23:03:06 2014 +0000 |
| tree | c7699dedfbe4fbc22fd066f958ef0c9aede57222 | |
| parent | 60302f1938e684407458e61b082353bf770c5dac [diff] | |
| parent | 928debf59a1c8249a6a502574f806955f2a166cc [diff] |
am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936 * commit '928debf59a1c8249a6a502574f806955f2a166cc': IMS call merge call-back changes.