merge from open-source master

Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf
This commit is contained in:
The Android Open Source Project
2010-04-12 13:11:26 -07:00

View File

@@ -74,7 +74,7 @@ sdk/files/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_te
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
# layout device definitiion
# layout device definition
sdk/files/devices.xml tools/lib/devices.xml
# emacs support from sdk.git