summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-01-14 18:31:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-01-14 18:31:21 -0800
commita9ec0ea5080a3ff96e8be3489541792577a1c417 (patch)
tree9d3c4f58499fe7528fa0ce8fc0634309362acbc2 /res
parent963575a864707e2ea40429ea1758815508057692 (diff)
parenta489e380036b047daba972115b6a2fd872098b5f (diff)
downloadCamera-a9ec0ea5080a3ff96e8be3489541792577a1c417.tar.gz
Merge "Fixed ANR in VideoModule." into gb-ub-photos-bryce
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions