tree b5357df8f483abb114cb212e0e60f35d70cbcf52
parent 29394eb7f99625bf99b26df2f4b2eec8d9f95170
parent e99056f372372400344a9a33f07c4337c0d5da92
author C. Sean Young <csyoung@google.com> 1440652229 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652229 +0000

am e99056f3: (-s ours) am 16f46fdf: Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.

* commit 'e99056f372372400344a9a33f07c4337c0d5da92':