OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d60b0ca
7765c25
)
am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
author
Wu-cheng Li
<wuchengli@google.com>
Sat, 10 Apr 2010 18:42:15 +0000
(11:42 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 10 Apr 2010 18:42:15 +0000
(11:42 -0700)
Merge commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92
' into froyo-plus-aosp
* commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92
':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Trivial merge