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:
e99acf7
3a06cce
)
Merge "Fix a mistake of CameraAgentFactory's recycle();" am: c7a2095139
author
Chao Zhang
<ZhangCharles518@gmail.com>
Tue, 29 May 2018 19:39:59 +0000
(12:39 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 29 May 2018 19:39:59 +0000
(12:39 -0700)
am:
3a06cce41f
Change-Id: I54ba29a63c2d14bed3d14b001dd43b98403041d2
1
2
src/com/android/camera/CameraActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/camera/CameraActivity.java
Simple merge