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:
c759efb
ba93fe6
)
Merge "Camera2: Update shading mode spec"
author
Zhijun He
<zhijunhe@google.com>
Sat, 18 Jan 2014 00:46:08 +0000
(
00:46
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 18 Jan 2014 00:46:08 +0000
(
00:46
+0000)
1
2
core/java/android/hardware/camera2/CameraMetadata.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/hardware/camera2/CaptureRequest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/camera2/CameraMetadata.java
Simple merge
diff --cc
core/java/android/hardware/camera2/CaptureRequest.java
Simple merge