tree 1599fd3ebeabeafcd500568fcbf5bb60bd3f6377
parent 27cd1f9f4c79bad337bf274014b6ee647e7ef2a6
parent 18bf694f3c704f57de3bfbb5d4d9cece33053965
author Colin Cross <ccross@android.com> 1568144163 -0700
committer android-build-merger <android-build-merger@google.com> 1568144163 -0700

Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev am: dd67a548b2
am: 18bf694f3c

Change-Id: I18e699541953e0cae3012e1c673e4f7b67c66370