summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorAlex Ray <aray@google.com>2012-09-28 10:30:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-28 10:30:39 -0700
commitd0dad6ece142f132f5d295330bfe386c2c28de46 (patch)
treeeac5c11c085ad1468e4337e49655e4375cf9f7d0 /media/libnbaio
parent823b786e8558b7e73d9096cdd629e8896226e422 (diff)
parent71d6454cc20b7a3bbe0cfd375c778c5fcc54795a (diff)
downloadframeworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.zip
frameworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.tar.gz
frameworks_av-d0dad6ece142f132f5d295330bfe386c2c28de46.tar.bz2
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
Diffstat (limited to 'media/libnbaio')
0 files changed, 0 insertions, 0 deletions