tree d13c0ac4b345bbbd01843b1b028f2b68f18704e0
parent d19f2d859f744ded5a70cf0d8a23427eac7ec817
parent 37f09d6d2ea329984a3182b99a38f170dc86661d
author Dan Albert <danalbert@google.com> 1405129310 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405129310 +0000

am 37f09d6d: Merge "Revert "Revert "Add locale aware APIs."""

* commit '37f09d6d2ea329984a3182b99a38f170dc86661d':
  Revert "Revert "Add locale aware APIs.""