summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-10-24 22:11:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-24 22:11:52 -0700
commitd6abaf326ba4e0ff342cf28a828b75a334beba69 (patch)
tree4ab689cdd5388445b67f235a65316b4583e5bc3e /include/camera
parentc2f78020d3887539fc90230d96465e4b1dc84d8e (diff)
parent145550a00ea59ff20133acc95315e463628e16db (diff)
downloadframeworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.zip
frameworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.tar.gz
frameworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.tar.bz2
am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp * commit '145550a00ea59ff20133acc95315e463628e16db': Document getPollBytes() and getActivationBytes().
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions