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:
b5e2d48
40659de
)
am 40659dea: am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e...
author
Eino-Ville Talvala
<etalvala@google.com>
Fri, 7 Mar 2014 11:02:18 +0000
(11:02 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 7 Mar 2014 11:02:18 +0000
(11:02 +0000)
* commit '
40659dea8eefaa9d7f5b742e3333d68b6f0dd89c
':
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
DO NOT MERGE: camera2/3: Add protection for still capture path
Trivial merge