tree ec4717f9994e572e6ec26e5ef4184bfbf9ea6e5c
parent 0e5292104b515d7eb9976b7d5c9e8c5e8a04a30d
parent 8b86373fd954276b18a6fba81afbe42c9caa49d3
author Tianjie Xu <xunchang@google.com> 1461190331 +0000
committer android-build-merger <android-build-merger@google.com> 1461190331 +0000

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

* commit '8b86373fd954276b18a6fba81afbe42c9caa49d3':
  Fix matches_locale function

Change-Id: I9494f416b12cba3c63972096137ddaf805bc453b