summaryrefslogtreecommitdiffstats
path: root/luni/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Update Cipher testsKenny Root2015-04-241-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InvalidAlgorithmParameterException should be thrown when Ciphers are initialized with null parameters during decrypt or unwrap mode if the Cipher expects it. Bug: 19201819 Change-Id: Id2ce1c3c7929769808fcc9a4048a28ec150e3672
* | | | | | am e81b5047: am 69f8fc65: Merge "Use ANDROID_ROOT instead of assuming it is ↵Nicolas Geoffray2015-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /system." * commit 'e81b5047062c6af7f84af2589311c505b25062f4': Use ANDROID_ROOT instead of assuming it is /system.
| * | | | | Merge "Use ANDROID_ROOT instead of assuming it is /system."Nicolas Geoffray2015-04-241-1/+1
| |\ \ \ \ \
| | * | | | | Use ANDROID_ROOT instead of assuming it is /system.Nicolas Geoffray2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow testing without having 'sh', or having an outdated 'sh' in /system. Change-Id: I19f2844822cc282c4e7696d45fb5ccbe1a1710eb
* | | | | | | am 8c95e178: am 2b7e589a: Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-245-15/+55
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8c95e17836c652ea89d5bfa94feab4396c332f6e': Tidy up Package and classloader comments
| * | | | | | Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-245-15/+55
| |\ \ \ \ \ \
| | * | | | | | Tidy up Package and classloader commentsNeil Fuller2015-04-225-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 31ae6d22605a0967d722f935bc3a8b868ada4917 Remove a TODO, improve a test and fix a comment. Also fixes a bug in Package demonstrated by the improved test. Bug: 20482259 Change-Id: I6b37413d7004ce85c99bb854e0ec41e5f8588250
* | | | | | | | am 975ebbc7: am dcc9e76a: Merge "Remove unnecessary code from ↵Narayan Kamath2015-04-242-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputStreamReader/OutputStreamWriter.init." * commit '975ebbc76ae07da5db4865bf76be6a22221740b4': Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.
| * | | | | | | Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.Narayan Kamath2015-04-242-2/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly check that the decoder/encoder isn't null instead. bug: 20452644 Change-Id: Ia43be6b03842af4e5c8945c8854db618b6ec357a
* | | | | | | am d3f115a1: am 73e9c6e1: Merge "java/io/RandomAccessFile: do not nullify ↵Sergio Giro2015-04-242-1/+61
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileChannel when closing the RAF" * commit 'd3f115a1c42e73b4759cc049fa7114439b847162': java/io/RandomAccessFile: do not nullify FileChannel when closing the RAF
| * | | | | | Merge "java/io/RandomAccessFile: do not nullify FileChannel when closing the ↵Sergio Giro2015-04-242-1/+61
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RAF"
| | * | | | | | java/io/RandomAccessFile: do not nullify FileChannel when closing the RAFSergio Giro2015-04-222-1/+61
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getChannel() should return always the same FileChannel, even if it's closed Bug: 19892782 Change-Id: I5bd853b6b0931d9a6320a655c4ef982c9beaa6c0
* | | | | | | am bd7c7451: am 726db7ae: Merge "Ensure consistency of capitalization in ↵Neil Fuller2015-04-236-326/+423
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit 'bd7c7451634fa46aef554dd6e09421ce2d6033a6': Ensure consistency of capitalization in RelativeDateTimeFormatter
| * | | | | | Merge "Ensure consistency of capitalization in RelativeDateTimeFormatter"Neil Fuller2015-04-236-326/+423
| |\ \ \ \ \ \
| | * | | | | | Ensure consistency of capitalization in RelativeDateTimeFormatterNeil Fuller2015-04-226-326/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains refactoring. Benchmarks below to show no appreciable negative performance impact to formatters. We do now cache a new type of formatter. Benchmarks measured in microseconds on mako. Before: DateIntervalFormat_formatDateRange_DATE 244 DateIntervalFormat_formatDateRange_DATE_TIME 256 DateIntervalFormat_formatDateRange_TIME 208 RelativeDateTimeFormatter_getRelativeDateTimeString 207.2 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 218.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 70.5 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 67.4 After: DateIntervalFormat_formatDateRange_DATE 237 DateIntervalFormat_formatDateRange_DATE_TIME 241 DateIntervalFormat_formatDateRange_TIME 200 RelativeDateTimeFormatter_getRelativeDateTimeString 149.4 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 161.8 RelativeDateTimeFormatter_getRelativeTimeSpanString 71.7 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 69.0 Bug: 20247811 Change-Id: I51075f89ca6b1d8862335e0e5a4d67a5624edfa6
* | | | | | | | am b2b83acf: am f8975208: Merge "Test that confirms a socket can be closed ↵Neil Fuller2015-04-231-0/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during connect()" * commit 'b2b83acf152d37d3449feac881bde01c0b92e695': Test that confirms a socket can be closed during connect()
| * | | | | | | Merge "Test that confirms a socket can be closed during connect()"Neil Fuller2015-04-221-0/+33
| |\ \ \ \ \ \ \
| | * | | | | | | Test that confirms a socket can be closed during connect()Neil Fuller2015-04-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added to confirm that a thread blocked during an infinite connect() will unblock if the socket is closed. Change-Id: If373d810cd5db7f68a28bab712d8a58ea1fc68be
* | | | | | | | | am ccb61deb: am 97ca5855: Merge "Move java.nio.Charsets to libcore.util."Narayan Kamath2015-04-224-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ccb61deb8f478f91404b75cbe19cb7b9cbcb4f76': Move java.nio.Charsets to libcore.util.
| * | | | | | | | Move java.nio.Charsets to libcore.util.Narayan Kamath2015-04-224-7/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't public API, and isn't related to NIO. It's only ever used by java.lang.String. bug: 10898787 Change-Id: I4e194406746b88ba7268c2553e467e7e05400b40
* | | | | | | | am 9cd55497: am 298bf64c: Merge "X509Certificate: Narrow down the scope of ↵Narayan Kamath2015-04-221-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caught exceptions." * commit '9cd55497d16cc2d8888dd204b5b63ace0645fa06': X509Certificate: Narrow down the scope of caught exceptions.
| * | | | | | | X509Certificate: Narrow down the scope of caught exceptions.Narayan Kamath2015-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fix the package name of the corresponding test so that vogar isn't confused. bug: 19245702 Change-Id: I647f0c9ca4c81bb41d4b64088b60f37ebc671e84
* | | | | | | | am 15c998b7: am f27a2123: Merge "java/security/cert: Use Locale.ROOT in ↵Sergio Giro2015-04-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X509CRLTest" * commit '15c998b739915c66a3206608b4ed09af2bcf1652': java/security/cert: Use Locale.ROOT in X509CRLTest
| * | | | | | | java/security/cert: Use Locale.ROOT in X509CRLTestSergio Giro2015-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor polishing requested by kroot@ in another change Change-Id: If8bc2b504236623788ffa2754c86e6525ea5b283
* | | | | | | | am f6755403: am 8dcee5ef: Merge "java/security/cert: delete test caveat in ↵Sergio Giro2015-04-221-9/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X509CRLTest" * commit 'f67554037e77acacd669481f47128e8aacce3d88': java/security/cert: delete test caveat in X509CRLTest
| * | | | | | | Merge "java/security/cert: delete test caveat in X509CRLTest"Sergio Giro2015-04-221-9/+1
| |\ \ \ \ \ \ \
| | * | | | | | | java/security/cert: delete test caveat in X509CRLTestSergio Giro2015-04-211-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caveat to overcome a problem in bouncycastle that was fixed there Bug: 19609712 Change-Id: I227db8e458e67af46ccb1c07bfca77a733f25979
* | | | | | | | | am 4d818829: am 72f2eb7f: Merge "Fix Class.forName(..., ..., null) to pass ↵Brian Carlstrom2015-04-222-13/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 068-classloader\'s testClassForName" * commit '4d81882996127ca855eacde8517a7c414746530e': Fix Class.forName(..., ..., null) to pass 068-classloader's testClassForName
| * | | | | | | | Fix Class.forName(..., ..., null) to pass 068-classloader's testClassForNameBrian Carlstrom2015-04-212-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused fallout elsewhere requiring - Package fix to pass 005-annotations - ObjectInputStream fix to pass 093-serialization Change-Id: I6bc470e20fa177e8a3debe55c90a84eef7ef518e
* | | | | | | | | am 36fc8b3c: am 7e59d13c: Merge "Return unlocalized TimeZoneID from ↵Narayan Kamath2015-04-212-1/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeZone.getTimeZone()" * commit '36fc8b3cf165c84666cf8cdab72789e3547117ca': Return unlocalized TimeZoneID from TimeZone.getTimeZone()
| * | | | | | | | Return unlocalized TimeZoneID from TimeZone.getTimeZone()Taiju Tsuiki2015-04-212-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISO 8601 recommends the numbers in the time zone string should be non-localized numbers. Though implemented version returns localized numbers depends on the default locale. This CL removes localization from formiting the time zone ID. Change-Id: If828bcebb13b8509f5caf4dd201a4dbcd7defc38
* | | | | | | | | am 69773bd2: am 21a0e54a: Merge "Remove support for reading mime types from ↵Narayan Kamath2015-04-211-61/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property files." * commit '69773bd217466a536c9317073a184d3907f58100': Remove support for reading mime types from property files.
| * | | | | | | | Remove support for reading mime types from property files.Narayan Kamath2015-04-211-61/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support was untested and unused and of very limited utility, given that this class is initialized in the zygote. It also discourages arbitrary changes to the priority order of mappings. Change-Id: I2a7f91d2956627cd59f948561c37678bc45d118d
* | | | | | | | am 92959e75: am 13867636: Merge "Implement mapLibraryName in Java."Elliott Hughes2015-04-162-14/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '92959e7581da88c897596e63098365db8663d3c6': Implement mapLibraryName in Java.
| * | | | | | | Merge "Implement mapLibraryName in Java."Elliott Hughes2015-04-162-14/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Implement mapLibraryName in Java.Elliott Hughes2015-04-162-14/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need for native code here. Change-Id: Iaeb0369b5638a6681fd94fd999641801719aaea2
* | | | | | | | am b059489d: am 83f2b5f3: Merge "Use ICU4J more in DateIntervalFormat and ↵Neil Fuller2015-04-163-113/+114
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit 'b059489d9b120279eff706efda839ff719e722e0': Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatter
| * | | | | | | Merge "Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatter"Neil Fuller2015-04-163-113/+114
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatterNeil Fuller2015-04-163-113/+114
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | General strategy: Switch to ICU classes for Calendar, and generally use ICU classes earlier to avoid multiple creations. This also incorporates some feedback from narayan@ from https://android-review.googlesource.com/#/c/145662/ Some small optimizations applied but the goal was not to make it much faster, just to confirm it wasn't much slower. It has sped up some methods, and slowed down others, but not much difference in absolute terms. All times in microseconds measured on a mako. Original: RelativeDateTimeFormatter_getRelativeDateTimeString 582.4 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 603.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 39.9 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 39.1 After: RelativeDateTimeFormatter_getRelativeDateTimeString 207.2 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 218.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 70.5 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 67.4 Original: DateIntervalFormat_formatDateRange_DATE 290 DateIntervalFormat_formatDateRange_DATE_TIME 298 DateIntervalFormat_formatDateRange_TIME 276 After: DateIntervalFormat_formatDateRange_DATE 244 DateIntervalFormat_formatDateRange_DATE_TIME 256 DateIntervalFormat_formatDateRange_TIME 208 Change-Id: If043bd55ffec37ed2735aa1593f327b38749218c
* | | | | | | am 4b915681: am 81347df7: Merge "Make Manifest#clone obey clone\'s contract."Narayan Kamath2015-04-161-6/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4b915681b32df299c93c2cd0a9911deba0ecdebd': Make Manifest#clone obey clone's contract.
| * | | | | | Make Manifest#clone obey clone's contract.Narayan Kamath2015-04-161-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must call through to Object.clone to ensure that we always return an object of the right type. If not, subclasses will have to override clone() instead of calling through to super.clone(). bug: 19748843 Change-Id: Ie2177bbc05c62281f48780e521ad66de3612561e
* | | | | | | am 85a9d24b: am d4884a61: Merge "Fix bad negation in Collections#binarySearch."Narayan Kamath2015-04-162-16/+88
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '85a9d24be7cc35e5a5015084c870d1046e6d3100': Fix bad negation in Collections#binarySearch.
| * | | | | | Fix bad negation in Collections#binarySearch.Narayan Kamath2015-04-162-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19749094 Change-Id: Id1d7bcf4abebb423fd3bbb7c8f379bf9e6234969
* | | | | | | am 4e0962cc: am bceeae5a: Merge "Unbreak Harmony MacTest."Alex Klyubin2015-04-151-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4e0962ccdef6808a8c72c6a486113a3aa89f62e1': Unbreak Harmony MacTest.
| * | | | | | Unbreak Harmony MacTest.Alex Klyubin2015-04-151-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test got broken by recenly added AndroidKeyStore-backed implementation of Mac which cannot be initialized with a SecretKeySpec. Bug: 20222007 Change-Id: Id4941347acd092b435d6797c5ee2477fae8cd516
* | | | | | am c5546c4c: am 0ed6c7db: Merge "Switch ↵Neil Fuller2015-04-147-302/+86
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DateIntervalFormat/RelativeDateTimeFormatter to ICU4J" * commit 'c5546c4c0812bba9d9a6b0611839465b9fd4eab6': Switch DateIntervalFormat/RelativeDateTimeFormatter to ICU4J
| * | | | | Switch DateIntervalFormat/RelativeDateTimeFormatter to ICU4JTravis Keep2015-04-147-302/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Information below from the existing benchmarks on a hammerhead. All times given in microseconds. Note that the new version is slower, but this is a small difference in absolute terms and means less maintenance for libcore. The ICU team is rewriting some of the underlying code in ICU4J for a future ICU release which may alter performance. ICU4C + JNI DateIntervalFormat_formatDateRange_DATE 67.8 DateIntervalFormat_formatDateRange_DATE_TIME 76.0 DateIntervalFormat_formatDateRange_TIME 54.8 ICU4J DateIntervalFormat_formatDateRange_DATE 179 DateIntervalFormat_formatDateRange_DATE_TIME 181 DateIntervalFormat_formatDateRange_TIME 167 ICU4C + JNI RelativeDateTimeFormatter_getRelativeDateTimeString 151.6 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 169.0 RelativeDateTimeFormatter_getRelativeTimeSpanString 27.8 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 27.7 ICU4J RelativeDateTimeFormatter_getRelativeDateTimeString 366.5 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 377.6 RelativeDateTimeFormatter_getRelativeTimeSpanString 23.2 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 22.9 Bug: 20127691 Change-Id: I1ebc08fd9c974743026ae1e6c848fb4de8aa0e48
* | | | | | am b483a6a7: am 3ac9db28: Merge "StrictJarFile: unittest for missing files"Nick Kralevich2015-04-141-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b483a6a7911024e5212318fc47d26614a27fca33': StrictJarFile: unittest for missing files
| * | | | | StrictJarFile: unittest for missing filesNick Kralevich2015-04-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to verify that we error out when the manifest declares a file which isn't present in the jar. Bug: 1162500 Change-Id: I3c6814c500d218036a5c0515e9f4f93e3f7a63d5
* | | | | | am 6ed782c4: am 29ee0563: Merge "StrictJarFile: better handle missing files"Nick Kralevich2015-04-141-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6ed782c48847bb817e123edc0c0eb081e905b8a8': StrictJarFile: better handle missing files