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:
b7e3363
ae85bc3
)
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
author
Tyler Gunn
<tgunn@google.com>
Wed, 6 Jan 2016 20:31:00 +0000
(20:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 6 Jan 2016 20:31:00 +0000
(20:31 +0000)
am:
ae85bc3c65
-s ours
* commit '
ae85bc3c65b33b8b00b610246e41e282d16605b9
':
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
Trivial merge