tree b290cac34603bf62ff7d8c75f9a9d94106d0a1df
parent 56ce968ae03b96f274e9d614b6553a53d7014c11
parent 4717478ad9a37e16caad5c33a85c062d5b0cb313
author Colin Cross <ccross@android.com> 1555467793 -0700
committer android-build-merger <android-build-merger@google.com> 1555467793 -0700

Merge "Always use aapt2 for prebuilt appcompat" am: bbfcef3fb7
am: 4717478ad9

Change-Id: Id9e64660d6d874c0ebd69bc5a82d49d4f46597a6