tree def2ce6e5ebecc5984d632f5c9a444ff24c70240
parent 27316a93e5979859ae98f506eca365784353007a
parent c7e487193aed3b102d6e55e0817de6e0460e0236
author Narayan Kamath <narayan@google.com> 1423759078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423759078 +0000

am c7e48719: Merge "Remove references to persist.sys.language/country."

* commit 'c7e487193aed3b102d6e55e0817de6e0460e0236':
  Remove references to persist.sys.language/country.