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:
029a28b
a8fb8ab
)
Merge "Add missing null checks on Conference and Connection." into nyc-dev
author
Tyler Gunn
<tgunn@google.com>
Tue, 29 Mar 2016 19:02:07 +0000
(19:02 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 29 Mar 2016 19:02:08 +0000
(19:02 +0000)
1
2
telecomm/java/android/telecom/Conference.java
patch
|
diff1
|
diff2
|
blob
|
history
telecomm/java/android/telecom/Connection.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
telecomm/java/android/telecom/Conference.java
Simple merge
diff --cc
telecomm/java/android/telecom/Connection.java
Simple merge