summaryrefslogtreecommitdiffstats
path: root/include/camera/Camera.h
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 20:27:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 20:27:15 -0700
commitbff26d156d23e55e2428e19b3fb7f52acf03f79f (patch)
treeb0993306b63215d4db6559a86f02bcdb5ff22c55 /include/camera/Camera.h
parent4924aee9cb1c5988359f3162b6e89689c5b101e1 (diff)
parent86f1b643d10e0b5b17ae01db3b81020db87b3295 (diff)
downloadframeworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.zip
frameworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.tar.gz
frameworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.tar.bz2
am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295' * commit '86f1b643d10e0b5b17ae01db3b81020db87b3295': Fix issue #3117918: No way to finish a native activity
Diffstat (limited to 'include/camera/Camera.h')
0 files changed, 0 insertions, 0 deletions