am 293006c9: am 418fdef2: am 7a85d9a1: Merge "Revert "Add locale aware APIs.""

* commit '293006c91b22105419e446268dee3b9b6d6e7dac':
This commit is contained in:
Dan Albert 2014-07-14 19:09:44 +00:00 committed by Android Git Automerger
commit 5b41373d49

Diff Content Not Available