OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d69c19
0feb9c9
)
am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
author
Tyler Gunn
<tgunn@google.com>
Mon, 1 Jun 2015 22:40:13 +0000
(22:40 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 1 Jun 2015 22:40:13 +0000
(22:40 +0000)
* commit '
0feb9c9cf947deb893f5a400489ecf7e48626281
':
IMS: Conference fixes
Trivial merge