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:
a1163d5
5ce118d
)
am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
author
Evan Charlton
<evanc@google.com>
Wed, 3 Dec 2014 18:36:10 +0000
(18:36 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 3 Dec 2014 18:36:10 +0000
(18:36 +0000)
* commit '
5ce118d1f4bdaaa1e85626d06d473b2dece949c3
':
Re-add Connection.getCallCapabilities
Trivial merge