tree bcf8bf8daa9104dac52ab956e837820327c18239
parent 2cd25cfceea22ba221d137d8f3e8494778a4c8f6
parent 8da74b1bfdf4568788223e91c161591235b4ad42
author Adam Lesinski <adamlesinski@google.com> 1508449411 +0000
committer android-build-merger <android-build-merger@google.com> 1508449411 +0000

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
am: 8da74b1bfd

Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1