diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-01-18 22:02:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 22:02:26 -0800 |
| commit | f18a427413d1cea7e245256810346837bd88cd8c (patch) | |
| tree | d1e018dd70d3d3960e8c94b9c6fd26b576b6d744 | |
| parent | acbb1f4c8a6a4085cd237b50fd0f2d1efe432e9f (diff) | |
| parent | 6210c50d31f45c28c2cddca405a4b946f7fbfb39 (diff) | |
| download | android_dalvik-f18a427413d1cea7e245256810346837bd88cd8c.tar.gz android_dalvik-f18a427413d1cea7e245256810346837bd88cd8c.tar.bz2 android_dalvik-f18a427413d1cea7e245256810346837bd88cd8c.zip | |
am 6210c50d: am eef67346: Merge "Fix proxy expectation." into honeycomb
* commit '6210c50d31f45c28c2cddca405a4b946f7fbfb39':
Fix proxy expectation.
| -rw-r--r-- | tests/044-proxy/expected.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/044-proxy/expected.txt b/tests/044-proxy/expected.txt index 69a94f280..4be26cf71 100644 --- a/tests/044-proxy/expected.txt +++ b/tests/044-proxy/expected.txt @@ -48,7 +48,7 @@ Got expected ie Proxy methods: [public native boolean $Proxy0.equals(java.lang.Object), public native int $Proxy0.hashCode(), public native java.lang.String $Proxy0.toString(), public native int $Proxy0.rectangle(int,int), public native int $Proxy0.square(int,int), public native int $Proxy0.trapezoid(int,double,int), public native java.lang.String $Proxy0.blob(), public native void $Proxy0.circle(int), public native void $Proxy0.upCheck(), public native void $Proxy0.upChuck(), public native double $Proxy0.blue(int), public native R0aa $Proxy0.checkMe(), public native int $Proxy0.green(double), public native int $Proxy0.mauve(java.lang.String), public native int $Proxy0.red(float)] Decl annos: [] Param annos (1) : [[]] -Proxy fields: [private static [[Ljava.lang.Throwable; $Proxy0.throws] +Proxy fields: [private static java.lang.Throwable[][] $Proxy0.throws] Dupe threw expected exception Clash threw expected exception Clash2 threw expected exception |