Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

display-client/build/build.xml

@@ -248,6 +248,9 @@
            </sequential>
        </for>
        <echo>------------------------------</echo>
        <echo>${temp}</echo>
        <var name="res_p" value="package -f -M ${project_home}/${manifest-xml} -S ${project_home}/${res-dir} ${temp} -A ${project_home}/${asset-dir} -I ${android-jar} -F ${resources-package} --auto-add-overlay"/>
		<exec executable="${aapt}" failonerror="true">