summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-04-11 16:52:10 +0100
committerTobias Thierer <tobiast@google.com>2017-04-19 23:35:17 +0100
commit4f9d47d7499f0ccd33fe31b4b4f93a626f200c69 (patch)
tree96233cdc34b44f9c6b4a06df66828d046157a0d8 /include/ScopedJavaUnicodeString.h
parentdecb673fdbd066ae760a77da00684d3e5b0f07f0 (diff)
Fix flaky FileInputStreamTest test.
This file seems to have suffered a bad merge of libcore commit 57afdfdc64eee6693ad7055f3097f30ecce08d82 where on top of the new code of that CL, some of the (flaky) old code from before that CL was kept. This CL fixes that by again deleting the undead (duplicate and flaky) code that was previously deleted/replaced in the above libcore commit. Test: cts-tradefed run cts -a arm64-v8a -m CtsLibcoreTestCases \ -t libcore.java.io.FileInputStreamTest#testSkipOnLargeFiles Bug: 37238094 Change-Id: I8fccc5d4c51be4b813e53288361f158c7789b9e6
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions