OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eacf946
961805e
)
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into...
author
Sascha Haeberling
<haeberling@google.com>
Thu, 4 Sep 2014 23:20:19 +0000
(23:20 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 4 Sep 2014 23:20:20 +0000
(23:20 +0000)
1
2
src/com/android/camera/CaptureModule.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/camera/CaptureModule.java
Simple merge