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:
aa1890f
cb3911d
)
am cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when already...
author
Eino-Ville Talvala
<etalvala@google.com>
Thu, 11 Oct 2012 00:52:31 +0000
(17:52 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 11 Oct 2012 00:52:31 +0000
(17:52 -0700)
* commit '
cb3911d30c515e06fbea0000af02fa3d09688943
':
Camera2: Don't error out of startPreview when already recording.
Trivial merge