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:
070004c
3cfd962
)
Merge commit '3cfd962f' into manualmerge
author
Seth Raphael
<magicseth@google.com>
Wed, 21 May 2014 21:40:56 +0000
(14:40 -0700)
committer
Seth Raphael
<magicseth@google.com>
Wed, 21 May 2014 21:40:56 +0000
(14:40 -0700)
Conflicts:
src/com/android/camera/app/CameraAppUI.java
Change-Id: I662798190c39dc889291a6eb3add77244875467f
1
2
src/com/android/camera/app/CameraAppUI.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/camera/app/CameraAppUI.java
Simple merge
OSDN Git Service
