tree 96e105f30aa1657153816b74d4faba74840dc382
parent d859b07920f35018d9a8da9f2fb40e2aeb1c962e
parent 06beab874939a4a7723e47979fc2fdc6219257a5
author Baligh Uddin <baligh@google.com> 1405970209 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970209 +0000

am 06beab87: (-s ours) am 1137b572: am 5388cb5e: Remove deprecated locales - DO NOT MERGE

* commit '06beab874939a4a7723e47979fc2fdc6219257a5':
  Remove deprecated locales - DO NOT MERGE