local.properties

## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#Tue Feb 02 15:37:33 COT 2021
sdk.dir=/home/mario/Android/Sdk
=======
#Mon Nov 03 23:18:37 NST 2014
=======
#Mon Aug 24 20:35:37 NDT 2015
>>>>>>> 9cc976d (latest working new preview)
=======
#Thu Oct 01 00:04:19 NDT 2015
>>>>>>> afe2e8e (moving to yuv2rgb renderscript)
=======
#Tue Oct 06 18:59:53 NDT 2015
>>>>>>> d1ff114 (close to all the rs working)
=======
#Thu Oct 22 22:20:19 NDT 2015
>>>>>>> e1c2f29 (halejlujah it fucking works!  Real pics (zoom in only for now))
=======
#Fri Oct 30 19:13:34 NDT 2015
>>>>>>> 4d83a7a (more real pics)
sdk.dir=/home/jon/android-sdks
>>>>>>> 48b25e2 (changes towards lollipop camera api support)
=======
#Tue Nov 15 20:09:30 NST 2016
sdk.dir=/Users/test/Library/Android/sdk
>>>>>>> 3e7da68 (Latest move to Android SDK 25, fix picture taking.. single only.  Permissions checking at startup min sdk 23)
=======
#Fri Jan 17 09:38:04 NST 2020
sdk.dir=/Users/jon/Library/Android/sdk
>>>>>>> 4c62fd4 (3.0.5.1 uploaded to the app store for fix remembering lens selections)
=======
#Mon Jul 06 16:34:06 UYT 2020
sdk.dir=/Users/mmorales/Library/Android/sdk
>>>>>>> 449fcf5 (Add looks interface. Apply look to stills and video mode. Delete looks)
=======
#Thu Jul 30 02:21:24 UYT 2020
sdk.dir=/Users/mmorales/Library/Android/sdk
>>>>>>> 4d00701 (Fixed crashes after merge)
=======
#Mon Aug 24 09:36:47 COT 2020
sdk.dir=C\:\\Users\\mario\\AppData\\Local\\Android\\Sdk
>>>>>>> 3836a3f (virtual stand-ins interface)