tree c96901497034fa9703bffe6198c255250459dd8e
parent 07c9edb2638b3a4cbb7482bab223c7c4df6800d6
parent d32182da0014b52cf23cc5865d7465b6eda99e6a
author Tianjie Xu <xunchang@google.com> 1461196615 +0000
committer android-build-merger <android-build-merger@google.com> 1461196615 +0000

Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5
am: d32182d

* commit 'd32182da0014b52cf23cc5865d7465b6eda99e6a':

Change-Id: I1adf6606782eb844d5993709715e463d3bb6efdf