merge -> android_branch

This commit is contained in:
Eric House 2014-04-18 06:10:25 -07:00
commit 48eb900212

View file

@ -49,7 +49,7 @@
<!-- extension targets. Uncomment the ones where you want to do custom work <!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets --> in between standard targets -->
<property name="INITIAL_CLIENT_VERS" value="3"/> <property name="INITIAL_CLIENT_VERS" value="4"/>
<target name="-pre-clean"> <target name="-pre-clean">
<exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null" <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null"
failonerror="true" > failonerror="true" >