tree ad1519f4bc46405fd63d824cbe33789296ccb492
parent 873703793384ac57f760c6f48cfac24aa7bf7640
parent 17b8f4f1ad45cb719f1612b24c660a18f67fee9f
author Colin Cross <ccross@android.com> 1561660058 -0700
committer android-build-merger <android-build-merger@google.com> 1561660058 -0700

[automerger skipped] Merge "Pass --legacy to aapt2 compile for DownloadProvider" am: eda6814cc2 am: a7c1ef78f5 -s ours am: 4e1fc23547 -s ours
am: 17b8f4f1ad -s ours
am skip reason: change_id Ib887cf802f411e7ebef119f39a7faedadc6a2f6f with SHA1 f339296414 is in history

Change-Id: Ie69fcff2caf9239acb642727e66ecfa914df9142