commit 741b5b7ef4c7fd4a786364bbf60d515489caff47
author Elliott Hughes <enh@google.com> Tue Jan 31 19:18:51 2012 -0800
committer Elliott Hughes <enh@google.com> Tue Jan 31 19:20:20 2012 -0800
tree e5d5f9ee5c1fb1c177c453985eeb1242e3d73bf7
parent 09cc2d39b3073ab0c613a9f660983e781693d958

Manually merge my AOSP update to the VM tests.

Original change: https://android-review.googlesource.com/32051

Bug: http://code.google.com/p/android/issues/detail?id=21599
Bug: http://code.google.com/p/android/issues/detail?id=21597
Change-Id: I31e440b66b720647afab54ca39fd6eb1bbb0cb60

test/087-gc-after-link/src/Main.java

diff --git a/test/087-gc-after-link/src/Main.java b/test/087-gc-after-link/src/Main.java
index 12fa56a..b28542f 100644
--- a/test/087-gc-after-link/src/Main.java
+++ b/test/087-gc-after-link/src/Main.java
@@ -79,7 +79,7 @@
                      * through reflection, then call loadClass on it.
                      */
                     dexClass = ClassLoader.getSystemClassLoader().
-                            loadClass("dalvik/system/DexFile");
+                            loadClass("dalvik.system.DexFile");
                     Constructor ctor = dexClass.
                             getConstructor(new Class[] {String.class});
                     dexFile = ctor.newInstance(DEX_FILE);