summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-08-16 01:34:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-16 01:34:43 +0000
commita3c601e70c8119a8c3dcc2026c4fb9875308b94c (patch)
tree1c7bc0bcf1b912704a3a76e98cafc7357246b4bc /camera
parente4dfac0e130fe95bfe445ea47ce3ed8ac590447f (diff)
parent4883125b0df72ee404de8b244c3e6511f62947ee (diff)
downloadframeworks_av-a3c601e70c8119a8c3dcc2026c4fb9875308b94c.zip
frameworks_av-a3c601e70c8119a8c3dcc2026c4fb9875308b94c.tar.gz
frameworks_av-a3c601e70c8119a8c3dcc2026c4fb9875308b94c.tar.bz2
am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev
* commit '4883125b0df72ee404de8b244c3e6511f62947ee': do not dequeue from native window after we hit fatal error
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions