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:
1b87107
9f880f7
)
Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
author
Eino-Ville Talvala
<etalvala@google.com>
Wed, 25 Sep 2013 19:28:03 +0000
(19:28 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 25 Sep 2013 19:28:03 +0000
(19:28 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/hardware/camera2/CameraMetadata.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/hardware/camera2/CaptureResult.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/java/android/hardware/camera2/CameraMetadata.java
Simple merge
diff --cc
core/java/android/hardware/camera2/CaptureResult.java
Simple merge