Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | am a3783569: Merge "Add ST_* constants to OsConstants" | Nick Kralevich | 2015-02-26 | 2 | -0/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Add ST_* constants to OsConstants | Nick Kralevich | 2015-02-26 | 2 | -0/+18 | |
| |/ / / / / | ||||||
* | | | | | | am 5889c5c8: Merge "Clarify docs for CharsetEncoder#flush." | Narayan Kamath | 2015-02-23 | 2 | -12/+34 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Clarify docs for CharsetEncoder#flush. | Narayan Kamath | 2015-02-23 | 2 | -12/+34 | |
* | | | | | | Merge commit '405aeb8a97eb0a5194c2803dde3968e10e1e509e' into HEAD | Bill Yi | 2015-02-19 | 12 | -16/+691 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | am db4499e1: Merge "Use ICU for relative time formatting" | Tao Bao | 2015-02-12 | 6 | -1/+1103 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| * | | | | | am a9c24ad8: Merge "Fix LocaleTest#testDefaultLocale." | Narayan Kamath | 2015-02-10 | 2 | -16/+18 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | am c512e722: Merge "Explicitly state all File constructor NPEs." | Elliott Hughes | 2015-02-07 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | am 0951821e: Merge "CharsetEncoder.flush() should only call implFlush() once." | Narayan Kamath | 2015-02-04 | 2 | -0/+59 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | am ebfb8f8b: Fixes associated with the tzdata 2015a update | Neil Fuller | 2015-02-03 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | Fixes associated with the tzdata 2015a update | Neil Fuller | 2015-02-02 | 1 | -8/+0 | |
| | * | | | | | | | Fix and clean up FileDescriptor.isSocket. | Elliott Hughes | 2015-01-08 | 2 | -7/+22 | |
| | * | | | | | | | SSLSocketTest: test close alert during handshake | Kenny Root | 2015-01-08 | 1 | -0/+148 | |
| * | | | | | | | | am e78093e9: Merge "Fix deflater in / out counts for inputs > 4G." | Narayan Kamath | 2015-01-30 | 6 | -5/+71 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | am 4ea6715f: Merge "Work around 32 bit glibc bug." | Narayan Kamath | 2015-01-30 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | am 2e7026cf: Merge "Regression tests for Etag handling" | Neil Fuller | 2015-01-27 | 1 | -0/+133 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | am ad2c9f9c: Merge "Fix the infinite loop issue of the conversion from string... | Elliott Hughes | 2015-01-23 | 2 | -134/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | am f9fbd0c7: Merge "Make Cipher.update return null for empty input." | Alex Klyubin | 2015-01-23 | 2 | -3/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am f0841451: Merge "Add SSLSocket tests which inspect emitted ClientHello fie... | Alex Klyubin | 2015-01-23 | 1 | -40/+159 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 98e588d0: Merge "Fix incorrect ordering of assertEquals" | Neil Fuller | 2015-01-23 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a8521691: Merge "Introduce user.locale [take 2]" | Narayan Kamath | 2015-01-22 | 3 | -52/+133 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 26bb4803: Merge "Use the IPv6 instead of the IPv4 wildcard address in sock... | Lorenzo Colitti | 2015-01-22 | 5 | -17/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1d5df1fb: Merge "Get rid of rule to generate a file with a # in its name." | Narayan Kamath | 2015-01-22 | 1 | -5/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 70af3d94: Merge "Clarify comment on private method." | Narayan Kamath | 2015-01-21 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6dc0ed72: Merge "Add a unit test to demonstrate ICU CharsetProvider problems" | Narayan Kamath | 2015-01-20 | 2 | -0/+58 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 934ecd56: Merge "Make socket binding behavior clearer" | Neil Fuller | 2015-01-20 | 5 | -46/+40 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 9005bec9 to lmp-mr1-dev-plus-aosp | Neil Fuller | 2015-01-20 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8602c015: Merge "Remove fcntlLong, use fcntlInt for F_SETFD instead." | Narayan Kamath | 2015-01-20 | 6 | -11/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9169032f: Merge "Add fcntlInt." | Narayan Kamath | 2015-01-19 | 6 | -20/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 510742b0: Merge "Add a warning about relative paths to ZipEntry#getName." | Narayan Kamath | 2015-01-16 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 791bd64d: Merge "Cache class and field lookups in StrictJarFile." | Narayan Kamath | 2015-01-16 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7861c3e6: Merge "Revert "Introduce user.locale."" | Narayan Kamath | 2015-01-16 | 3 | -57/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a4fe2227: Merge "Introduce user.locale." | Narayan Kamath | 2015-01-16 | 3 | -8/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3cdad0e1: Merge "Fix confusing Selector docs" | Neil Fuller | 2015-01-14 | 1 | -5/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1a923668: Merge "Fix the hostname for the IPv6 loopback address" | Neil Fuller | 2015-01-14 | 3 | -16/+87 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6bfd8701: Merge "More FileDescriptor.isSocket cleanup." | Elliott Hughes | 2015-01-09 | 3 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fac834b8: Merge "Fix and clean up FileDescriptor.isSocket." | Elliott Hughes | 2015-01-08 | 2 | -7/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 85a9dbbb: Merge "SSLSocketTest: test close alert during handshake" | Kenny Root | 2015-01-08 | 1 | -0/+148 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c9c4daa0: Merge "Add a test for bug 18644314." | Narayan Kamath | 2015-01-08 | 1 | -9/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ecd42914: Merge "Fix a javadoc typo in java.net.URL.equals." | Elliott Hughes | 2015-01-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2bec0e75: Merge "Avoid a type conversion during comparison" | Neil Fuller | 2015-01-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 880bf04a: Merge "Extend ArrayList fastpath to Collections.sort(List<T>, Co... | Narayan Kamath | 2015-01-02 | 1 | -7/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7d286dee: Merge "Fix documentation for Calendar#clone." | Narayan Kamath | 2015-01-02 | 2 | -1/+75 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f891c7de: Merge "Fix CharsetEncoder.canEncode for empty CharSequences" | Narayan Kamath | 2014-12-31 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 50e0273a: Merge "Add a zero-copy path for Collections.sort() on ArrayList." | Narayan Kamath | 2014-12-30 | 2 | -7/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c3c69f07: Merge "Fix integer overflow issue in ZoneInfo." | Narayan Kamath | 2014-12-30 | 2 | -9/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 904dbce0: Merge "MimeUtils: add ODF presentation (template)" | Elliott Hughes | 2014-12-27 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8a2692f0: Merge "Fix thread correctness issue in OldAndroidMonitorTest." | Narayan Kamath | 2014-12-24 | 1 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 35b10b44: Merge "Add various system calls needed by the zygote." | Elliott Hughes | 2014-12-18 | 5 | -0/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e30cdc87: Merge "Add hwp to MimeUtils map." | Elliott Hughes | 2014-12-18 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |