diff options
author | Nick Pelly <npelly@google.com> | 2010-10-24 22:16:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 22:16:39 -0700 |
commit | 197eee425c813e35144b2e52f7282b17a57289a5 (patch) | |
tree | 4bff348d951936a712ec23e1fc5b85d88ad4fed0 /include/camera | |
parent | b3b113a8be88942da3c7a17dce4b3e064e1c1583 (diff) | |
parent | d6abaf326ba4e0ff342cf28a828b75a334beba69 (diff) | |
download | frameworks_base-197eee425c813e35144b2e52f7282b17a57289a5.zip frameworks_base-197eee425c813e35144b2e52f7282b17a57289a5.tar.gz frameworks_base-197eee425c813e35144b2e52f7282b17a57289a5.tar.bz2 |
am d6abaf32: am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69'
* commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69':
Document getPollBytes() and getActivationBytes().
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions