diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-09-10 18:43:06 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-09-10 18:43:06 -0700 |
| commit | e5b3ad0151c34de658c24d8e8876eff794d289eb (patch) | |
| tree | 1ec2f20355d8c7d42def7c41db527d35a7017433 /files | |
| parent | e8fbce75ed481c2bc7f3f0d471af1f5d2894b8d0 (diff) | |
| parent | 0a3b9b3c4e73abf826866cec9fca394d690caed2 (diff) | |
| download | sdk-e5b3ad0151c34de658c24d8e8876eff794d289eb.zip sdk-e5b3ad0151c34de658c24d8e8876eff794d289eb.tar.gz sdk-e5b3ad0151c34de658c24d8e8876eff794d289eb.tar.bz2 | |
merge from open-source master
Change-Id: I7f8d4353f2905aa5de511e61f4d0f13e0bc4ddc6
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/test_rules.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/ant/test_rules.xml b/files/ant/test_rules.xml index 62fc77d..955fba4 100644 --- a/files/ant/test_rules.xml +++ b/files/ant/test_rules.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="android_test_rules" default="run-tests"> - <import file="ant_rules_r3.xml" /> + <import file="main_rules.xml" /> <property name="tested.project.absolute.dir" location="${tested.project.dir}" /> <property name="instrumentation.dir" value="instrumented" /> |