Ricky Barrette
fc8952e5e9
auto mereger. (I removed the auto merge option from project.properties) Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
11 lines
419 B
Properties
11 lines
419 B
Properties
# This file is automatically generated by Android Tools.
|
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
#
|
|
# 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 Ant
|
|
# For customization when using a Version Control System, please read the
|
|
# header note.
|
|
sdk.dir=/app/android-sdk-linux_86
|