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:
73b1d94
d8c21e8
)
Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
author
Ruben Brunk
<rubenbrunk@google.com>
Wed, 11 Jun 2014 00:09:36 +0000
(
00:09
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 10 Jun 2014 22:18:15 +0000
(22:18 +0000)
1
2
core/java/android/hardware/camera2/CameraManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/camera2/CameraManager.java
Simple merge