diff options
| author | 2016-03-17 23:17:23 +0000 | |
|---|---|---|
| committer | 2016-03-17 23:17:24 +0000 | |
| commit | 0f1b6b76e67144349fc0a66c25f0ba13f5efb45a (patch) | |
| tree | 2f86c1577dbb2c3e1456b0301232da073ee2e675 /test/145-alloc-tracking-stress/src/Main.java | |
| parent | 0f474872afa353ac30012e679d77fa622e574d78 (diff) | |
| parent | 4eb90bf9f170a1d0a8b48be5227ac56613ae641c (diff) | |
Merge changes Ib979b2a4,I35b3fed2,I356acd03
* changes:
Revert "Ignore 145-alloc-tracking-stress run-test failures with CC."
Revert "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
Revert "Ignore 145-alloc-tracking-stress failures with JIT and CC."
Diffstat (limited to 'test/145-alloc-tracking-stress/src/Main.java')
| -rw-r--r-- | test/145-alloc-tracking-stress/src/Main.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/145-alloc-tracking-stress/src/Main.java b/test/145-alloc-tracking-stress/src/Main.java index 418690a2a6..752fdd9135 100644 --- a/test/145-alloc-tracking-stress/src/Main.java +++ b/test/145-alloc-tracking-stress/src/Main.java @@ -1,4 +1,5 @@ /* + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); |