tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent cf7a80e990b23ffbfe33b50f4246d04735328812
parent 9ee5dc9613c7ee82d94efe49021802f6ed16bd5e
author Jesse Wilson <jessewilson@google.com> 1294711302 -0800
committer Jesse Wilson <jessewilson@google.com> 1294711302 -0800

Merge commit 'e80fc1da' into manualmerge

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

Change-Id: I0e6af0c9b4d0f322e1f74c639707916daa153e71