summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am a3783569: Merge "Add ST_* constants to OsConstants"Nick Kralevich2015-02-262-0/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a378356955bcaf7be9434e8babed1b106f741a00': Add ST_* constants to OsConstants
| * | | | | | Add ST_* constants to OsConstantsNick Kralevich2015-02-262-0/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose ST_* constants via OsConstants. Without these constants being exposed, it's impossible to meaningfully use StructStatVfs.f_flag returned from the Os.statvfs() call. For now, @hide the new constants. Change-Id: I82536521972e9e87a1936dd712b9e8153d120cc1
* | | | | | am 5889c5c8: Merge "Clarify docs for CharsetEncoder#flush."Narayan Kamath2015-02-232-12/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5889c5c8d2e814e9319135f52f1947c463c82561': Clarify docs for CharsetEncoder#flush.
| * | | | | Clarify docs for CharsetEncoder#flush.Narayan Kamath2015-02-232-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flush may return CoderResult.MALFORMED if the input was "incomplete", say for eg. if the last char was one half of a surrogate pair. Note that encoder subclasses cannot detect this inside encode() because the overrideable encodeLoop() method isn't told whether it's at the end of input or not. This change also introduces a test to demonstrate this behaviour. bug: 19185235 Change-Id: Ie1170fe1409a1abb883ef6f36ac8589855b3b2ab
* | | | | | 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
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'db4499e1983c9649c8de7697d10825028fd8094d': Use ICU for relative time formatting
| * | | | | am a9c24ad8: Merge "Fix LocaleTest#testDefaultLocale."Narayan Kamath2015-02-102-16/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9c24ad83f3cd18738268559169ba901b5f70232': Fix LocaleTest#testDefaultLocale.
| * \ \ \ \ \ am c512e722: Merge "Explicitly state all File constructor NPEs."Elliott Hughes2015-02-071-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c512e722651ab516a01d84aacd93f264c09f5175': Explicitly state all File constructor NPEs.
| * \ \ \ \ \ \ am 0951821e: Merge "CharsetEncoder.flush() should only call implFlush() once."Narayan Kamath2015-02-042-0/+59
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0951821efa25eed9d7b4372ee7ee8ac063682c68': CharsetEncoder.flush() should only call implFlush() once.
| * \ \ \ \ \ \ \ am ebfb8f8b: Fixes associated with the tzdata 2015a updateNeil Fuller2015-02-031-8/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad': Fixes associated with the tzdata 2015a update
| | * | | | | | | Fixes associated with the tzdata 2015a updateNeil Fuller2015-02-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chile has changed the rules for DST. The test duplicates testApia below it, so it can be removed. Bug: 19212588 Change-Id: Iaaca895ef2b49a6aa57ca26df5842eefaab60bde
| | * | | | | | | Fix and clean up FileDescriptor.isSocket.Elliott Hughes2015-01-082-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original logic was accidentally inverted. This prevented sockets from being untagged, which would result in cancelled requests stalling out with sub-optimal TCP ZeroWindow detection instead of sending RST packets. Add a comment explaining how this works. Switch from SO_ERROR (which has a side-effect) to SO_DEBUG (which doesn't). Add a unit test. Bug: 18706592 (cherry picked from commit 4f263fdfcc0c9e3ebadeaa6717e93a130c09320c) Change-Id: I6746f4e0e5a6c9788cdcf35f74ccca5aa9a0e8b4
| | * | | | | | | SSLSocketTest: test close alert during handshakeKenny Root2015-01-081-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a client/server gets a close alert during a handshake, it should give a sane error message instead of something that is confusing to the developer. (cherry picked from commit 58d0df7981667d3add1b94c57eb9d7e1b29dc2b1) Bug: 18758595 Change-Id: I5d8d7dcb74fed4ff0ab943b5dc666819ec076e31
| * | | | | | | | am e78093e9: Merge "Fix deflater in / out counts for inputs > 4G."Narayan Kamath2015-01-306-5/+71
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e78093e94e9b2ad7877b331230333e8d083ff5e1': Fix deflater in / out counts for inputs > 4G.
| * \ \ \ \ \ \ \ \ am 4ea6715f: Merge "Work around 32 bit glibc bug."Narayan Kamath2015-01-301-0/+17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ea6715f1cb6edbce3cbbc4c50e1a712ec70d565': Work around 32 bit glibc bug.
| * \ \ \ \ \ \ \ \ \ am 2e7026cf: Merge "Regression tests for Etag handling"Neil Fuller2015-01-271-0/+133
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e7026cf945f2fd4b88646391730017744956e0d': Regression tests for Etag handling
| * \ \ \ \ \ \ \ \ \ \ am ad2c9f9c: Merge "Fix the infinite loop issue of the conversion from ↵Elliott Hughes2015-01-232-134/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string to double" * commit 'ad2c9f9ca55844588561d2ad86a24fb88a2aec74': Fix the infinite loop issue of the conversion from string to double
| * \ \ \ \ \ \ \ \ \ \ \ am f9fbd0c7: Merge "Make Cipher.update return null for empty input."Alex Klyubin2015-01-232-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9fbd0c737fdc41dc1956d370021e511c95bebc3': Make Cipher.update return null for empty input.
| * \ \ \ \ \ \ \ \ \ \ \ \ am f0841451: Merge "Add SSLSocket tests which inspect emitted ClientHello ↵Alex Klyubin2015-01-231-40/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fields." * commit 'f0841451c86cc9fa932dbc08271c8dc96da6ca38': Add SSLSocket tests which inspect emitted ClientHello fields.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 98e588d0: Merge "Fix incorrect ordering of assertEquals"Neil Fuller2015-01-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98e588d05806a211ac7c59b8282c27fd23e9a5ef': Fix incorrect ordering of assertEquals
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a8521691: Merge "Introduce user.locale [take 2]"Narayan Kamath2015-01-223-52/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8521691a4a538600da8cd1b0b59ce23807a534c': Introduce user.locale [take 2]
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 26bb4803: Merge "Use the IPv6 instead of the IPv4 wildcard address in ↵Lorenzo Colitti2015-01-225-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sockets." * commit '26bb48032cdcc8d69484ff168389c34e1f873250': Use the IPv6 instead of the IPv4 wildcard address in sockets.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1d5df1fb: Merge "Get rid of rule to generate a file with a # in its name."Narayan Kamath2015-01-221-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d5df1fbd8c786e0f936cb0175e4a3f288fc1890': Get rid of rule to generate a file with a # in its name.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70af3d94: Merge "Clarify comment on private method."Narayan Kamath2015-01-211-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70af3d949171b22f70a87b1f0dde15f561ed4ca9': Clarify comment on private method.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6dc0ed72: Merge "Add a unit test to demonstrate ICU CharsetProvider problems"Narayan Kamath2015-01-202-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6dc0ed7247a7520bf14a89db9b4bc3015d3cdcb2': Add a unit test to demonstrate ICU CharsetProvider problems
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 934ecd56: Merge "Make socket binding behavior clearer"Neil Fuller2015-01-205-46/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '934ecd5677fec1bae56662c10920a331e17eea81': Make socket binding behavior clearer
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 9005bec9 to lmp-mr1-dev-plus-aospNeil Fuller2015-01-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe7eeed87a56401ca0ef923d688f28acb51122b4
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8602c015: Merge "Remove fcntlLong, use fcntlInt for F_SETFD instead."Narayan Kamath2015-01-206-11/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8602c015f60df0b7385580407d1c75d7c47f9a71': Remove fcntlLong, use fcntlInt for F_SETFD instead.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9169032f: Merge "Add fcntlInt."Narayan Kamath2015-01-196-20/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9169032f055cb8f007fcb9df979518177e22c833': Add fcntlInt.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 510742b0: Merge "Add a warning about relative paths to ZipEntry#getName."Narayan Kamath2015-01-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '510742b01e0662c1c6078783d0ef0c4184ba9945': Add a warning about relative paths to ZipEntry#getName.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 791bd64d: Merge "Cache class and field lookups in StrictJarFile."Narayan Kamath2015-01-161-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '791bd64d1d5d369fa21ecc1b276d918255916d54': Cache class and field lookups in StrictJarFile.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7861c3e6: Merge "Revert "Introduce user.locale.""Narayan Kamath2015-01-163-57/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7861c3e60b7769a9cce11015a48842f1b1712360': Revert "Introduce user.locale."
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a4fe2227: Merge "Introduce user.locale."Narayan Kamath2015-01-163-8/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4fe2227d3c7e72b84d0ac6b3e15f811564b24ee': Introduce user.locale.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3cdad0e1: Merge "Fix confusing Selector docs"Neil Fuller2015-01-141-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3cdad0e18459a53bdf7e33c6509244a5928cefa5': Fix confusing Selector docs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1a923668: Merge "Fix the hostname for the IPv6 loopback address"Neil Fuller2015-01-143-16/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a923668463640b1e0cbdc9d90bc4530240fc75d': Fix the hostname for the IPv6 loopback address
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6bfd8701: Merge "More FileDescriptor.isSocket cleanup."Elliott Hughes2015-01-093-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bfd8701461f0794a529e00dd12c61b67a5497d3': More FileDescriptor.isSocket cleanup.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fac834b8: Merge "Fix and clean up FileDescriptor.isSocket."Elliott Hughes2015-01-082-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fac834b863bf75a34a181036ded4662cf7dac102': Fix and clean up FileDescriptor.isSocket.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 85a9dbbb: Merge "SSLSocketTest: test close alert during handshake"Kenny Root2015-01-081-0/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85a9dbbb2c2ab46104315de67c7978acaf675f21': SSLSocketTest: test close alert during handshake
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9c4daa0: Merge "Add a test for bug 18644314."Narayan Kamath2015-01-081-9/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9c4daa0a9013d5109da08729cef0e3233ac6d01': Add a test for bug 18644314.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ecd42914: Merge "Fix a javadoc typo in java.net.URL.equals."Elliott Hughes2015-01-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecd42914677fde7762bd47e33d5a0dd81989c9e9': Fix a javadoc typo in java.net.URL.equals.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2bec0e75: Merge "Avoid a type conversion during comparison"Neil Fuller2015-01-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bec0e7565816cdcc86be312cc473904ef52db4e': Avoid a type conversion during comparison
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 880bf04a: Merge "Extend ArrayList fastpath to Collections.sort(List<T>, ↵Narayan Kamath2015-01-021-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparator<T>)." * commit '880bf04a93307044ea608982b92a33c0995abf3a': Extend ArrayList fastpath to Collections.sort(List<T>, Comparator<T>).
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d286dee: Merge "Fix documentation for Calendar#clone."Narayan Kamath2015-01-022-1/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d286deeff7a2ba63d3981408654f527f7831ee3': Fix documentation for Calendar#clone.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f891c7de: Merge "Fix CharsetEncoder.canEncode for empty CharSequences"Narayan Kamath2014-12-311-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f891c7deeeeb20ef5b7217634365a2ed48c50050': Fix CharsetEncoder.canEncode for empty CharSequences
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50e0273a: Merge "Add a zero-copy path for Collections.sort() on ArrayList."Narayan Kamath2014-12-302-7/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50e0273a38619924b582b1e1394d6049dde13cda': Add a zero-copy path for Collections.sort() on ArrayList.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c3c69f07: Merge "Fix integer overflow issue in ZoneInfo."Narayan Kamath2014-12-302-9/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3c69f0786877aec9c4cb1279f43dc35e668f273': Fix integer overflow issue in ZoneInfo.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 904dbce0: Merge "MimeUtils: add ODF presentation (template)"Elliott Hughes2014-12-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '904dbce05917afc0746177c83c6b901a95b05fbe': MimeUtils: add ODF presentation (template)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a2692f0: Merge "Fix thread correctness issue in OldAndroidMonitorTest."Narayan Kamath2014-12-241-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a2692f0583a58868345c98ac641f84f6e355ac7': Fix thread correctness issue in OldAndroidMonitorTest.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35b10b44: Merge "Add various system calls needed by the zygote."Elliott Hughes2014-12-185-0/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35b10b445782451536ced17fc77c21f852313f3f': Add various system calls needed by the zygote.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e30cdc87: Merge "Add hwp to MimeUtils map."Elliott Hughes2014-12-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e30cdc8737286c3963128585e190389786436b90': Add hwp to MimeUtils map.