OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
234b9b3
d0dad6e
)
am 24dfc952: Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
author
Alex Ray
<aray@google.com>
Fri, 28 Sep 2012 17:33:18 +0000
(10:33 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 28 Sep 2012 17:33:18 +0000
(10:33 -0700)
* commit '
24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b
':
Camera2: Re-entering preview state on v2 Device
Trivial merge