tree 55a19319df65b91d5d79c01ab6efb51ba7b01a8e
parent 9562f9a40812092c0604bbf3f2b8036cb731e7b8
parent 6089fd5fdd714073bc9ce2f527fb84a2c4ca4b80
author Pete Gillin <peteg@google.com> 1561641424 -0700
committer android-build-merger <android-build-merger@google.com> 1561641424 -0700

Merge "Make the linter use a JAXB jar instead of the deprecated module." am: 5410a8a911
am: 6089fd5fdd

Change-Id: Ifd4e9b47e5734187370bc0f1b0b785d75067081c