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:
ade6d8a
929e551
)
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
author
Wei Huang
<weih@google.com>
Fri, 23 Sep 2011 17:05:22 +0000
(10:05 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 23 Sep 2011 17:05:22 +0000
(10:05 -0700)
* commit '
3d9a9e55df85c720573e69ec3062efc331ea69bb
':
Update camera javadoc about AE and AWB lock.
Trivial merge