tree f637be9cd4d251ab97e57e1dd7cb738f311c3884
parent bdeea77138dd74d3463063df8e022c7614eea8aa
parent 759152ea160fe146abbea2e9d6ae2e5918652571
author Baligh Uddin <baligh@google.com> 1405970241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970241 +0000

am 759152ea: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '759152ea160fe146abbea2e9d6ae2e5918652571':
  Remove deprecated locales - DO NOT MERGE