tree 71cf320482cb3fc9a4c18cd539457f7160f96152
parent c15177b8b8f125c0c86bd7dabacde1289e68c45e
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: If7726c2f381ba0e4ab0519b77c167e75a9d46104