tree 693067b107974da6f1964de4f2e4df841de10383
parent 273d167d62a10b246cb8f7e68900a39bad54b86b
parent 5c0601d65a43c9b76e1ef565189cc8f9e1336917
author Colin Cross <ccross@android.com> 1527823167 -0700
committer android-build-merger <android-build-merger@google.com> 1527823167 -0700

[automerger skipped] Merge "Add support for --replace-version to aapt2" am: 186be90eb6
am: 5c0601d65a  -s ours

Change-Id: I7614f591744a46274e657f38dcf9ee364c274d1a