summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Avoid a type conversion during comparison"Neil Fuller2015-01-061-1/+1
|\
| * Avoid a type conversion during comparisonNeil Fuller2015-01-061-1/+1
|/
* Merge "Fix Harmony's HostnameVerifierTest breakage."Alex Klyubin2015-01-051-3/+3
|\
| * Fix Harmony's HostnameVerifierTest breakage.Alex Klyubin2015-01-051-3/+3
* | Merge "Extend ArrayList fastpath to Collections.sort(List<T>, Comparator<T>)."Narayan Kamath2015-01-022-14/+47
|\ \
| * | Extend ArrayList fastpath to Collections.sort(List<T>, Comparator<T>).Narayan Kamath2015-01-022-14/+47
* | | Merge "Fix documentation for Calendar#clone."Narayan Kamath2015-01-022-1/+75
|\ \ \ | |/ / |/| |
| * | Fix documentation for Calendar#clone.Narayan Kamath2014-12-312-1/+75
|/ /
* | Merge "Fix CharsetEncoder.canEncode for empty CharSequences"Narayan Kamath2014-12-311-0/+4
|\ \
| * | Fix CharsetEncoder.canEncode for empty CharSequencesNarayan Kamath2014-12-311-0/+4
|/ /
* | Merge "Add a zero-copy path for Collections.sort() on ArrayList."Narayan Kamath2014-12-303-7/+91
|\ \
| * | Add a zero-copy path for Collections.sort() on ArrayList.Narayan Kamath2014-12-303-7/+91
|/ /
* | Merge "Fix integer overflow issue in ZoneInfo."Narayan Kamath2014-12-302-9/+34
|\ \
| * | Fix integer overflow issue in ZoneInfo.Narayan Kamath2014-12-302-9/+34
|/ /
* | Merge "MimeUtils: add ODF presentation (template)"Elliott Hughes2014-12-271-0/+2
|\ \
| * | MimeUtils: add ODF presentation (template)Miklos Vajna2014-12-271-0/+2
|/ /
* | Merge "Fix thread correctness issue in OldAndroidMonitorTest."Narayan Kamath2014-12-241-7/+7
|\ \
| * | Fix thread correctness issue in OldAndroidMonitorTest.Junjie Hu2014-12-241-7/+7
* | | Merge "Create GregorianCalendar via a delegate."Narayan Kamath2014-12-241-1/+7
|\ \ \ | |/ / |/| |
| * | Create GregorianCalendar via a delegate.Deepanshu Gupta2014-12-241-1/+7
|/ /
* | Merge "Move heap trimming daemon and GC deamon into a single daemon"Mathieu Chartier2014-12-202-33/+27
|\ \
| * | Move heap trimming daemon and GC deamon into a single daemonMathieu Chartier2014-12-192-33/+27
| |/
* | Merge "Add various system calls needed by the zygote."Elliott Hughes2014-12-185-0/+52
|\ \
| * | Add various system calls needed by the zygote.Elliott Hughes2014-12-175-0/+52
* | | Merge "Add hwp to MimeUtils map."Elliott Hughes2014-12-181-0/+1
|\ \ \ | |/ / |/| |
| * | Add hwp to MimeUtils map.Sungmin Choi2014-12-171-0/+1
|/ /
* | Merge "Don't TEMP_FAILURE_RETRY calls that can't fail."Elliott Hughes2014-12-171-4/+4
|\ \
| * | Don't TEMP_FAILURE_RETRY calls that can't fail.Elliott Hughes2014-12-171-4/+4
|/ /
* | Merge "Don't try to build the libcore native code on the Mac."Elliott Hughes2014-12-171-0/+4
|\ \
| * | Don't try to build the libcore native code on the Mac.Elliott Hughes2014-12-171-0/+4
|/ /
* | Merge "Fix poll to never return EINTR."Elliott Hughes2014-12-175-44/+56
|\ \ | |/ |/|
| * Fix poll to never return EINTR.Elliott Hughes2014-12-175-44/+56
* | Merge "Add a hidden API for detecting response charsets."Narayan Kamath2014-12-162-0/+142
|\ \
| * | Add a hidden API for detecting response charsets.Narayan Kamath2014-12-162-0/+142
|/ /
* | Merge "Repurpose "HexEncoding" for internal users."Narayan Kamath2014-12-165-97/+179
|\ \ | |/ |/|
| * Repurpose "HexEncoding" for internal users.Narayan Kamath2014-12-165-97/+179
* | Merge "Remove unnecessary include directives."Elliott Hughes2014-12-152-9/+2
|\ \
| * | Remove unnecessary include directives.Elliott Hughes2014-12-152-9/+2
* | | Merge "Move GC daemon locking logic into heap"Mathieu Chartier2014-12-152-21/+13
|\ \ \ | |/ / |/| |
| * | Move GC daemon locking logic into heapMathieu Chartier2014-12-152-21/+13
|/ /
* | Merge "Update ByteBuffer positions in Posix.* functions."Narayan Kamath2014-12-155-45/+176
|\ \
| * | Update ByteBuffer positions in Posix.* functions.Narayan Kamath2014-12-155-45/+176
|/ /
* | Merge "When connecting to a SOCKS proxy, use the resolved IP"Neil Fuller2014-12-151-7/+3
|\ \
| * | When connecting to a SOCKS proxy, use the resolved IPNeil Fuller2014-12-081-7/+3
* | | Merge "Fix InetSocketAddress.getHostString(): return the name if available"Neil Fuller2014-12-154-1/+55
|\ \ \
| * | | Fix InetSocketAddress.getHostString(): return the name if availableNeil Fuller2014-12-034-1/+55
* | | | Merge "Fix Mac build (control reaches end of non-void function)."Elliott Hughes2014-12-131-0/+1
|\ \ \ \
| * | | | Fix Mac build (control reaches end of non-void function).Elliott Hughes2014-12-121-0/+1
|/ / / /
* | | | Merge "Fix Mac build (unused parameter)."Elliott Hughes2014-12-131-1/+1
|\ \ \ \
| * | | | Fix Mac build (unused parameter).Elliott Hughes2014-12-121-1/+1