OSDN Git Service

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)
commit5fae742a1e5ff0dcfa870b4521a9db796d9db4f9
treebcf8bf8daa9104dac52ab956e837820327c18239
parent2cd25cfceea22ba221d137d8f3e8494778a4c8f6
parent8da74b1bfdf4568788223e91c161591235b4ad42
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
am: 8da74b1bfd

Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1