commit | 1091f59e5dfc0c561171d829db4133e92de49ca4 | [log] [tgz] |
---|---|---|
author | Ihab Awad <ihab@google.com> | Fri May 30 21:55:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 30 21:55:31 2014 +0000 |
tree | ce3cf8037f7ac5d33faaaa8ea27b6258aeb8ddd8 | |
parent | ee36492fac16169f622c8f554385b602593b7e71 [diff] | |
parent | 3da92d6df15fcbf9dbde7e3f58f778ab28abaa99 [diff] |
am 8e206c02: (-s ours) Merge "DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback" into lmp-preview-dev * commit '8e206c02a1869a28820b146c05514124776288ca': DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback