am 51ecd212: merge from open-source master

This commit is contained in:
The Android Open Source Project
2010-04-28 13:06:48 -07:00
committed by Android Git Automerger

View File

@@ -71,6 +71,9 @@ sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
sdk/files/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
sdk/files/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
# newer Ant rules.
sdk/files/ant_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r3.xml
sdk/files/ant_test_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r3.xml
sdk/files/ant_lib_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r3.xml
sdk/files/ant_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r2.xml
sdk/files/ant_test_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r2.xml
sdk/files/ant_lib_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r2.xml