tree 45a8a50ffc6ae9707e1a02cc7c6d4079a29bb6d5
parent 1ebf81e58f1d546b97b7d3ee136257ebf00938e3
parent dba735e9a52411bc8b7cc5e54359a981b6ce016e
author Colin Cross <ccross@android.com> 1550257836 -0800
committer android-build-merger <android-build-merger@google.com> 1550257836 -0800

Merge "Fix resource overlay order for static libraries"
am: dba735e9a5

Change-Id: Ibeb88897c5b532fb4c3cb2935641fe555f05dc46