tree 71cf320482cb3fc9a4c18cd539457f7160f96152
parent 9eeeb17e05e5a44c582dc58e30f12bf0c20517ff
parent 210b0a5a20830beea3b3e96e84c6b3fd2a626cf5
author Tianjie Xu <xunchang@google.com> 1461194760 +0000
committer android-build-merger <android-build-merger@google.com> 1461194760 +0000

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

* commit '210b0a5a20830beea3b3e96e84c6b3fd2a626cf5':

Change-Id: I0ead2ccee7d8a2db4a2ac585a2054ee80abd569c