diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java index 759c443..55bf947 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellCallback.java @@ -18,4 +18,5 @@ package com.android.dumprendertree; public interface TestShellCallback { public void finished(); + public void timedOut(String url); } |