tree 71cf320482cb3fc9a4c18cd539457f7160f96152
parent 07f0912fe6bd5d4971ceb497e9b921ce20e6d9db
parent 45609d37efe3ced3a599b6eccd6e6dbd184152e6
author Tianjie Xu <xunchang@google.com> 1461191413 +0000
committer android-build-merger <android-build-merger@google.com> 1461191413 +0000

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

* commit '45609d37efe3ced3a599b6eccd6e6dbd184152e6':
  Fix matches_locale function

Change-Id: I3f3a41dbcb4ab42d287f36b6ff0f2eaa6806f99a