summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-06-19 23:17:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-19 23:17:16 +0000
commitaf64fa580e6b3e250f0e3be7af09f462e553763e (patch)
tree96bf824b847a6a49139f4ce921c1d1aba82c68ab
parent0c3af5d8d1f7c9e94818c496c6f7e5a89359007d (diff)
parentef3d4ea038690127ca6c685017fea6fb3aeaf61d (diff)
downloadandroid_development-af64fa580e6b3e250f0e3be7af09f462e553763e.tar.gz
android_development-af64fa580e6b3e250f0e3be7af09f462e553763e.tar.bz2
android_development-af64fa580e6b3e250f0e3be7af09f462e553763e.zip
am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart"
* commit 'ef3d4ea038690127ca6c685017fea6fb3aeaf61d': Replace libdvm reference with libart
-rw-r--r--ide/eclipse/.classpath2
1 files changed, 1 insertions, 1 deletions
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index af99325f1..0b21bb27c 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -106,7 +106,7 @@
<classpathentry kind="src" path="development/samples/Snake/tests/src"/>
<classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="libcore/json/src/main/java"/>
- <classpathentry kind="src" path="libcore/libdvm/src/main/java"/>
+ <classpathentry kind="src" path="libcore/libart/src/main/java"/>
<classpathentry kind="src" path="libcore/luni/src/main/java"/>
<classpathentry kind="src" path="libcore/xml/src/main/java"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>