tree 8f4b9ed39a31f11076bf74b1b719a8f4d46a5418
parent a12138273029396bfd08ca7c4d2c003201ab59e1
parent 4cfbb695ea3a5bc5b22e992ea4ae00ac8c1ae959
author Yigit Boyar <yboyar@google.com> 1515173747 +0000
committer android-build-merger <android-build-merger@google.com> 1515173747 +0000

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

Change-Id: I54badeb9947578815f352ed430f86e1f8451c08a