tree c6af0ff488d9085df6d6d0e8f0a0ea05be8c620b
parent 794e196acaf5e9f96c13fac75d871df8184c8780
parent a7c1ef78f54a67c52a6e540298dda3c5cb6c6b36
author Colin Cross <ccross@android.com> 1561574626 -0700
committer android-build-merger <android-build-merger@google.com> 1561574626 -0700

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

Change-Id: I50ec8d4b35760ad122b6fa7323e277ec9bba80d8