OSDN Git Service

Merge commit 'da18d995' into manualmerge
authorJesse Wilson <jessewilson@google.com>
Thu, 15 Apr 2010 21:26:42 +0000 (14:26 -0700)
committerJesse Wilson <jessewilson@google.com>
Thu, 15 Apr 2010 21:26:42 +0000 (14:26 -0700)
commit60bd7511c21dabc06c6b7df2e720064fc3ad5442
tree80a3c1dce690c1059e81826bf0aa4f94050839ef
parent153ebc2d2756ee5c0963dbc159c40e810b89cb12
parentda18d99558da028acdef9f1479a957146c4e314d
Merge commit 'da18d995' into manualmerge

Conflicts:
libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java