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:
9534f87
13d07d0
)
am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
author
Sascha Häberling
<haeberling@google.com>
Sat, 6 Sep 2014 02:58:09 +0000
(
02:58
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 6 Sep 2014 02:58:09 +0000
(
02:58
+0000)
* commit '
13d07d0ecb3bc808fb6f5b65508b1948ab3149d8
':
DO NOT MERGE Pipe context through to camera
Trivial merge