summaryrefslogtreecommitdiffstats
path: root/version.mk
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-08-04 12:50:34 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-21 18:46:32 -0700
commite3d36c451e9e66c7786c169248c3a8aa06b67de7 (patch)
tree1d1fdc563297db51c912203c40ec29a731ae14bc /version.mk
parent9fc9fd41865ae855b5d8bb925b8100a16aa63c3b (diff)
downloadandroid_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.gz
android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.bz2
android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.zip
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'version.mk')
0 files changed, 0 insertions, 0 deletions