summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/camera2
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-10-10 16:36:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 16:36:04 -0700
commit0f95fadb8a3ee402f2c51a932a06f1f685ab2d35 (patch)
tree9ca9478a5391a897d5283f85f0873f35abc284da /services/camera/libcameraservice/camera2
parentf52309555013e9909b248374f96d22dae29f6454 (diff)
parent7e2c0a15bb8086460070811a152029726479a297 (diff)
downloadframeworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.zip
frameworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.tar.gz
frameworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.tar.bz2
am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '7e2c0a15bb8086460070811a152029726479a297': Support querying active record sources
Diffstat (limited to 'services/camera/libcameraservice/camera2')
0 files changed, 0 insertions, 0 deletions