tree 633320a2068c6e7971627f4580ef0eb3402cb658
parent 9b1ac239cdad62de8dab458cec40eb752593dc9b
parent 3c00e18ba7425a1837a1e458f16e5192254a196b
author Alexandra Gherghina <alexgherghina@google.com> 1417627630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417627630 +0000

am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

* commit '3c00e18ba7425a1837a1e458f16e5192254a196b':
  Modify account settings for better locale resolution