summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-04-22 09:21:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-22 09:21:27 -0700
commitfa189d0d74d8da0ab19c8d9c6cd16fa80d406e9c (patch)
treec7bf0610f50acbccee428211f1462eebf8763662 /camera
parent22ce7101128e32648fc2178800baee0ba9a75a70 (diff)
parent45f1f86eb97356b73811fc4d70af437c55a86dd7 (diff)
downloadframeworks_av-fa189d0d74d8da0ab19c8d9c6cd16fa80d406e9c.zip
frameworks_av-fa189d0d74d8da0ab19c8d9c6cd16fa80d406e9c.tar.gz
frameworks_av-fa189d0d74d8da0ab19c8d9c6cd16fa80d406e9c.tar.bz2
am 45f1f86e: am f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev
* commit '45f1f86eb97356b73811fc4d70af437c55a86dd7': A flush of a video decoder connected to a native window must reclaim
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions