tree cf68ccbb40d697f20db4d6994ef2fe102a25ac8c
parent a47d053d65702e856c8e21c23274afe2fda82759
parent 9b6836aabee945b6c7a54796a4e6a7ae735f423c
author Baligh Uddin <baligh@google.com> 1405970207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970207 +0000

am 9b6836aa: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '9b6836aabee945b6c7a54796a4e6a7ae735f423c':
  Remove deprecated locales - DO NOT MERGE