tree 1cf0dcb5443465bd14102c655318f75570597577
parent 44f86e63cd48fb867bf7ce619cabfab7cdd181ae
parent b2200b494e1143d37375b555a279e35a26a22441
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1515173793 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1515173793 +0000

[automerger] Merge "Allow LOCALIZED and UNICODE collations" into oc-mr1-support-27.0-dev am: 4cfbb695ea am: b2200b494e

Change-Id: I12299e997cd4ebadb8077cc65bd104b4b86a8feb