tree d8535ab61fb9b15a1aa56964edfd3022447de424
parent c45dfef30fee2c15d5cf9822b5cc055543948655
parent 97a22150ae54eb113a25bc3651bed30c9e76b307
author C. Sean Young <csyoung@google.com> 1440685078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685078 +0000

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

* commit '97a22150ae54eb113a25bc3651bed30c9e76b307':