am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart"

* commit 'ef3d4ea038690127ca6c685017fea6fb3aeaf61d':
  Replace libdvm reference with libart
This commit is contained in:
Brian Carlstrom
2014-06-19 23:17:16 +00:00
committed by Android Git Automerger

View File

@@ -106,7 +106,7 @@
<classpathentry kind="src" path="development/samples/Snake/tests/src"/> <classpathentry kind="src" path="development/samples/Snake/tests/src"/>
<classpathentry kind="src" path="libcore/dalvik/src/main/java"/> <classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="libcore/json/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/luni/src/main/java"/>
<classpathentry kind="src" path="libcore/xml/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"/> <classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>