tree f4ac468be9d1ff9f33ece8786d90b062e957c59f
parent 1e14bed0c6f7bd34ad18397981c4ab0a5c8f2e78
parent 6f8fecd2e3f84ac2fba7cff4763f9ba97a484cbd
author Martin Stjernholm <mast@google.com> 1607979542 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1607979542 +0000

Merge "Stopgap fix to avoid aapt2 build errors."