summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2016-01-10 13:29:24 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-11 10:44:18 -0800
commit2d5e458a41f51b5fd8db45c0179d1b0afedcdac0 (patch)
tree6d8640766f4658d1ae32a0733f301739f479e21e /res
parent8f10ee0855ba35a2e7dce8534edb81a420d14d5c (diff)
downloadandroid_packages_apps_Snap-2d5e458a41f51b5fd8db45c0179d1b0afedcdac0.tar.gz
android_packages_apps_Snap-2d5e458a41f51b5fd8db45c0179d1b0afedcdac0.tar.bz2
android_packages_apps_Snap-2d5e458a41f51b5fd8db45c0179d1b0afedcdac0.zip
Fix mismerge of "SnapdragonCamera: fix screen flash on resuming"
Change-Id: I9c2c7a74b5816b3f930e22ee1fce625e7ad768e3
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions