summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* s/Ipv6/IPv6/Elliott Hughes2011-09-291-1/+1
* Fix the InetAddress/Inet4Address/Inet6Address documentation.Elliott Hughes2011-09-294-292/+158
* Merge "Give InputStream/OutputStream decent documentation."Jesse Wilson2011-09-142-24/+49
|\
| * Give InputStream/OutputStream decent documentation.Jesse Wilson2011-09-142-24/+49
* | Reconcile with gingerbread-mr4-releaseThe Android Open Source Project2011-09-140-0/+0
|\ \ | |/ |/|
| * keep history after reconcile of gingerbread-releaseThe Android Automerger2011-09-120-0/+0
| |\
* | \ Merge "Discourage developers from catching subclasses of SocketException."Jesse Wilson2011-09-126-11/+16
|\ \ \
| * | | Discourage developers from catching subclasses of SocketException.Jesse Wilson2011-09-126-11/+16
* | | | Merge "Make socket channel address available after bind()."Jesse Wilson2011-09-121-3/+1
|\ \ \ \
| * | | | Make socket channel address available after bind().Jesse Wilson2011-09-121-3/+1
| |/ / /
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-releaseJean-Baptiste Queru2011-09-090-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | / | | | |/ | | |/|
| | | * Remove DigiNotar Root CABrian Carlstrom2011-08-302-121/+0
| | * | Remove DigiNotar Root CABrian Carlstrom2011-09-022-121/+0
| * | | Remove DigiNotar Root CABrian Carlstrom2011-08-302-121/+0
| |/ /
* | | am 308df1d9: (-s ours) am 623ec56a: Remove DigiNotar Root CABrian Carlstrom2011-08-300-0/+0
|\ \ \
| * \ \ am 623ec56a: Remove DigiNotar Root CABrian Carlstrom2011-08-292-121/+0
| |\ \ \
| | * | | Remove DigiNotar Root CABrian Carlstrom2011-08-292-121/+0
| | | |/ | | |/|
* | | | am 26085321: am 203990d7: (-s ours) am 75aea4d5: Remove DigiNotar Root CABrian Carlstrom2011-08-300-0/+0
|\ \ \ \ | |/ / /
| * | | am 203990d7: (-s ours) am 75aea4d5: Remove DigiNotar Root CABrian Carlstrom2011-08-290-0/+0
| |\ \ \
| | * \ \ am 75aea4d5: Remove DigiNotar Root CABrian Carlstrom2011-08-292-121/+0
| | |\ \ \
| | | * | | Remove DigiNotar Root CABrian Carlstrom2011-08-292-121/+0
| | | | |/ | | | |/|
* | | | | Tests to verify that reflection + anonymous classes works properly.Jesse Wilson2011-08-301-0/+39
* | | | | Remove DigiNotar Root CABrian Carlstrom2011-08-291-121/+0
* | | | | Merge "Test that Calendars can in fact be serialized."Jesse Wilson2011-08-251-0/+34
|\ \ \ \ \
| * | | | | Test that Calendars can in fact be serialized.Jesse Wilson2011-08-251-0/+34
* | | | | | Merge "Return real FileDescriptor in Socket wrappers."Jeff Sharkey2011-08-254-1/+23
|\ \ \ \ \ \
| * | | | | | Return real FileDescriptor in Socket wrappers.Jeff Sharkey2011-08-244-1/+23
* | | | | | | Merge "Fix makefile function call syntax"Ying Wang2011-08-251-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix makefile function call syntaxYing Wang2011-07-271-2/+2
* | | | | | | Make QueryTimeoutTest understandable.Jesse Wilson2011-08-253-731/+175
* | | | | | | Merge "CipherSpi.engineUpdate should handle null engineUpdate result"Brian Carlstrom2011-08-241-0/+3
|\ \ \ \ \ \ \
| * | | | | | | CipherSpi.engineUpdate should handle null engineUpdate resultBrian Carlstrom2011-08-231-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Update expectations for CTS: We still don't support notations.Jesse Wilson2011-08-241-0/+8
|/ / / / / /
* | | | | | Merge "Clear the preferences nodes before asserting about them."Jesse Wilson2011-08-191-165/+92
|\ \ \ \ \ \
| * | | | | | Clear the preferences nodes before asserting about them.Jesse Wilson2011-08-191-165/+92
* | | | | | | Don't expect caching of partial (HTTP 206) responses.Jesse Wilson2011-08-191-1/+1
|/ / / / / /
* | | | | | Merge "Fix JarInputStream Manifest parsing."Jesse Wilson2011-08-182-8/+15
|\ \ \ \ \ \
| * | | | | | Fix JarInputStream Manifest parsing.Jesse Wilson2011-08-182-8/+15
* | | | | | | Permit file:///foo or file:/fooJesse Wilson2011-08-181-2/+4
|/ / / / / /
* | | | | | Fix typo in Javadoc for onReadFromDiskCasey Ho2011-08-171-1/+1
* | | | | | Merge "Don't leave the thread's interrupted bit set."Jesse Wilson2011-08-161-0/+1
|\ \ \ \ \ \
| * | | | | | Don't leave the thread's interrupted bit set.Jesse Wilson2011-08-161-0/+1
* | | | | | | Merge "Don't let a helper thread die with an exception."Jesse Wilson2011-08-161-102/+76
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't let a helper thread die with an exception.Jesse Wilson2011-08-161-102/+76
* | | | | | | Merge "Fix the PackageTest to not rely on a Class.getPackage() side effect."Jesse Wilson2011-08-162-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix the PackageTest to not rely on a Class.getPackage() side effect.Jesse Wilson2011-08-162-1/+9
| |/ / / / / /
* | | | | | | Don't assume the test thread's group will have children.Jesse Wilson2011-08-161-8/+15
|/ / / / / /
* | | | | | Merge "Make HTTP implementation details public for CTS tests."Jesse Wilson2011-08-168-122/+268
|\ \ \ \ \ \
| * | | | | | Make HTTP implementation details public for CTS tests.Jesse Wilson2011-08-158-122/+268
* | | | | | | Merge "Don't rely on side effects of other tests in OldStmtTest."Jesse Wilson2011-08-151-167/+134
|\ \ \ \ \ \ \