tree cd27adff4abc4dd2a5a9f9b50e272c0d107615a4
parent a9361e91157f13d42dc677b41f2a5783478856c0
parent 8284349fc9e03fb11c85a7dbdc8096d79be46279
author Adam Lesinski <adamlesinski@google.com> 1507068438 +0000
committer android-build-merger <android-build-merger@google.com> 1507068438 +0000

Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev am: 9b581c7bc1
am: 8284349fc9

Change-Id: Iadd7362ae8456279ebec3a4577ba5be0c8bf19d7