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:
7f938d6
9cefdd4
)
resolved conflicts for merge of 9cefdd49 to ub-camera-haleakala
author
Jiawen Chen
<jiawen@google.com>
Wed, 10 Sep 2014 23:00:18 +0000
(16:00 -0700)
committer
Jiawen Chen
<jiawen@google.com>
Wed, 10 Sep 2014 23:00:18 +0000
(16:00 -0700)
Change-Id: I5aa115c3469cdff71c410e016155d0c83d6e51c1
1
2
src/com/android/camera/one/v2/OneCameraZslImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/camera/one/v2/OneCameraZslImpl.java
Simple merge
OSDN Git Service
