summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-23 10:36:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-23 10:36:05 -0700
commit9e83f44c0b310a72a080c006ebc3c07bdccc7027 (patch)
treefc25ddb265e2dda2683f2728147eb8eb82f274c0 /media
parent9cdf6db50c0dab30f32291bf00c702ca79132674 (diff)
parent6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc (diff)
downloadframeworks_av-9e83f44c0b310a72a080c006ebc3c07bdccc7027.zip
frameworks_av-9e83f44c0b310a72a080c006ebc3c07bdccc7027.tar.gz
frameworks_av-9e83f44c0b310a72a080c006ebc3c07bdccc7027.tar.bz2
am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc': Camera2: Increase mode update timeout.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions