summaryrefslogtreecommitdiffstats
path: root/camera/camera2/ICameraDeviceUser.cpp
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2014-11-21 02:45:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-21 02:45:47 +0000
commit9f77da1003b5a68034a9c34a057517eabbc24326 (patch)
tree997e43d39c1cbb5b7fb6079de34a224bf0da1554 /camera/camera2/ICameraDeviceUser.cpp
parent0cd651d18eeee52be945b0379b667473549bbf63 (diff)
parentc2d88d0b1571c11187e32b94e281ded17606070f (diff)
downloadframeworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.zip
frameworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.tar.gz
frameworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.tar.bz2
am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev
automerge: c2d88d0 * commit 'c2d88d0b1571c11187e32b94e281ded17606070f': camera2: fix an error reading a NULL string
Diffstat (limited to 'camera/camera2/ICameraDeviceUser.cpp')
0 files changed, 0 insertions, 0 deletions