summaryrefslogtreecommitdiffstats
path: root/include/camera/Camera.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-10-10 17:23:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 17:23:19 -0700
commitaa1890ff61b06c0f19ae5cf60720e351f62ba600 (patch)
tree2956037b390841f117678e4bbe3444733f5a50e2 /include/camera/Camera.h
parent31fb725372f2f62a234c4f43c66504dddeaf3c8f (diff)
parent0f95fadb8a3ee402f2c51a932a06f1f685ab2d35 (diff)
downloadframeworks_av-aa1890ff61b06c0f19ae5cf60720e351f62ba600.zip
frameworks_av-aa1890ff61b06c0f19ae5cf60720e351f62ba600.tar.gz
frameworks_av-aa1890ff61b06c0f19ae5cf60720e351f62ba600.tar.bz2
am 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '0f95fadb8a3ee402f2c51a932a06f1f685ab2d35': Support querying active record sources
Diffstat (limited to 'include/camera/Camera.h')
0 files changed, 0 insertions, 0 deletions