tree b66ff44be122f225e5af6f3fcfc4546f37ea71e6
parent 4838105a39ae6c608c2a0e242ead249d8683a5d0
parent c0271e9981ddd85a13ed88defd0b5b1a5ccc6f46
author Jesse Wilson <jessewilson@google.com> 1326212748 -0500
committer Jesse Wilson <jessewilson@google.com> 1326212748 -0500

Merge branch 'master' of https://code.google.com/p/dexmaker

Conflicts:
	src/test/java/com/google/dexmaker/DexMakerTest.java