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:
a036d59
23d2938
)
Merge "camera2: Add support for logical camera"
author
Shuzhen Wang
<shuzhenwang@google.com>
Mon, 22 Jan 2018 20:30:15 +0000
(20:30 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 22 Jan 2018 20:30:15 +0000
(20:30 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/hardware/camera2/CameraCharacteristics.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/hardware/camera2/CameraMetadata.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/java/android/hardware/camera2/CameraCharacteristics.java
Simple merge
diff --cc
core/java/android/hardware/camera2/CameraMetadata.java
Simple merge