tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent ae725d46003a752667529270f222753b6b2cb2da
parent 9a0690a0a79abd1739464bf2b93af8860324cd5b
author Jesse Wilson <jessewilson@google.com> 1294700560 -0800
committer Jesse Wilson <jessewilson@google.com> 1294700560 -0800

Merge commit '763220b4' into manualmerge

Conflicts:
	luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java

Change-Id: I9ecdb5fb1ac11a87a70ed659700dd7386e46652f