summaryrefslogtreecommitdiffstats
path: root/luni/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | am a3783569: Merge "Add ST_* constants to OsConstants"Nick Kralevich2015-02-262-0/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add ST_* constants to OsConstantsNick Kralevich2015-02-262-0/+18
| |/ / / / /
* | | | | | am 5889c5c8: Merge "Clarify docs for CharsetEncoder#flush."Narayan Kamath2015-02-232-12/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clarify docs for CharsetEncoder#flush.Narayan Kamath2015-02-232-12/+34
* | | | | | Merge commit '405aeb8a97eb0a5194c2803dde3968e10e1e509e' into HEADBill Yi2015-02-1912-16/+691
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am db4499e1: Merge "Use ICU for relative time formatting"Tao Bao2015-02-126-1/+1103
| |\ \ \ \ \ | | |/ / / /
| * | | | | am a9c24ad8: Merge "Fix LocaleTest#testDefaultLocale."Narayan Kamath2015-02-102-16/+18
| |\ \ \ \ \
| * \ \ \ \ \ am c512e722: Merge "Explicitly state all File constructor NPEs."Elliott Hughes2015-02-071-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 0951821e: Merge "CharsetEncoder.flush() should only call implFlush() once."Narayan Kamath2015-02-042-0/+59
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am ebfb8f8b: Fixes associated with the tzdata 2015a updateNeil Fuller2015-02-031-8/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Fixes associated with the tzdata 2015a updateNeil Fuller2015-02-021-8/+0
| | * | | | | | | Fix and clean up FileDescriptor.isSocket.Elliott Hughes2015-01-082-7/+22
| | * | | | | | | SSLSocketTest: test close alert during handshakeKenny Root2015-01-081-0/+148
| * | | | | | | | am e78093e9: Merge "Fix deflater in / out counts for inputs > 4G."Narayan Kamath2015-01-306-5/+71
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 4ea6715f: Merge "Work around 32 bit glibc bug."Narayan Kamath2015-01-301-0/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 2e7026cf: Merge "Regression tests for Etag handling"Neil Fuller2015-01-271-0/+133
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am ad2c9f9c: Merge "Fix the infinite loop issue of the conversion from string...Elliott Hughes2015-01-232-134/+33
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am f9fbd0c7: Merge "Make Cipher.update return null for empty input."Alex Klyubin2015-01-232-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am f0841451: Merge "Add SSLSocket tests which inspect emitted ClientHello fie...Alex Klyubin2015-01-231-40/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 98e588d0: Merge "Fix incorrect ordering of assertEquals"Neil Fuller2015-01-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a8521691: Merge "Introduce user.locale [take 2]"Narayan Kamath2015-01-223-52/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 26bb4803: Merge "Use the IPv6 instead of the IPv4 wildcard address in sock...Lorenzo Colitti2015-01-225-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1d5df1fb: Merge "Get rid of rule to generate a file with a # in its name."Narayan Kamath2015-01-221-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70af3d94: Merge "Clarify comment on private method."Narayan Kamath2015-01-211-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6dc0ed72: Merge "Add a unit test to demonstrate ICU CharsetProvider problems"Narayan Kamath2015-01-202-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 934ecd56: Merge "Make socket binding behavior clearer"Neil Fuller2015-01-205-46/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 9005bec9 to lmp-mr1-dev-plus-aospNeil Fuller2015-01-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8602c015: Merge "Remove fcntlLong, use fcntlInt for F_SETFD instead."Narayan Kamath2015-01-206-11/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9169032f: Merge "Add fcntlInt."Narayan Kamath2015-01-196-20/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 510742b0: Merge "Add a warning about relative paths to ZipEntry#getName."Narayan Kamath2015-01-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 791bd64d: Merge "Cache class and field lookups in StrictJarFile."Narayan Kamath2015-01-161-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7861c3e6: Merge "Revert "Introduce user.locale.""Narayan Kamath2015-01-163-57/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a4fe2227: Merge "Introduce user.locale."Narayan Kamath2015-01-163-8/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3cdad0e1: Merge "Fix confusing Selector docs"Neil Fuller2015-01-141-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1a923668: Merge "Fix the hostname for the IPv6 loopback address"Neil Fuller2015-01-143-16/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6bfd8701: Merge "More FileDescriptor.isSocket cleanup."Elliott Hughes2015-01-093-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fac834b8: Merge "Fix and clean up FileDescriptor.isSocket."Elliott Hughes2015-01-082-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 85a9dbbb: Merge "SSLSocketTest: test close alert during handshake"Kenny Root2015-01-081-0/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9c4daa0: Merge "Add a test for bug 18644314."Narayan Kamath2015-01-081-9/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ecd42914: Merge "Fix a javadoc typo in java.net.URL.equals."Elliott Hughes2015-01-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2bec0e75: Merge "Avoid a type conversion during comparison"Neil Fuller2015-01-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 880bf04a: Merge "Extend ArrayList fastpath to Collections.sort(List<T>, Co...Narayan Kamath2015-01-021-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d286dee: Merge "Fix documentation for Calendar#clone."Narayan Kamath2015-01-022-1/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f891c7de: Merge "Fix CharsetEncoder.canEncode for empty CharSequences"Narayan Kamath2014-12-311-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50e0273a: Merge "Add a zero-copy path for Collections.sort() on ArrayList."Narayan Kamath2014-12-302-7/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c3c69f07: Merge "Fix integer overflow issue in ZoneInfo."Narayan Kamath2014-12-302-9/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 904dbce0: Merge "MimeUtils: add ODF presentation (template)"Elliott Hughes2014-12-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a2692f0: Merge "Fix thread correctness issue in OldAndroidMonitorTest."Narayan Kamath2014-12-241-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35b10b44: Merge "Add various system calls needed by the zygote."Elliott Hughes2014-12-185-0/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e30cdc87: Merge "Add hwp to MimeUtils map."Elliott Hughes2014-12-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \