tree 2113f43be944ff7497a4990a4a9d944cbb4a3985
parent ce29a4c77a041c5073200fa36d534165dc674400
parent 9b581c7bc176c67a1281560148c17e6d76c068de
author Adam Lesinski <adamlesinski@google.com> 1507067469 +0000
committer android-build-merger <android-build-merger@google.com> 1507067469 +0000

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

Change-Id: I55d8c73df0ce751472e58a9ae505c94edc90c68e