summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-18 17:58:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-18 17:58:26 -0700
commit74e58c55bc5259b957a51f1bb44a5911ad1f8400 (patch)
tree6d8b2be02ef95ee91f60b0f391f95a405560c2ab /drm
parent2f93127de30bbe17707ca8923c486d4494ffda37 (diff)
parent1f266efe8ce2976b6531fab8698716354b2247f8 (diff)
downloadframeworks_av-74e58c55bc5259b957a51f1bb44a5911ad1f8400.zip
frameworks_av-74e58c55bc5259b957a51f1bb44a5911ad1f8400.tar.gz
frameworks_av-74e58c55bc5259b957a51f1bb44a5911ad1f8400.tar.bz2
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
Diffstat (limited to 'drm')
0 files changed, 0 insertions, 0 deletions