tree 79ea34b7ccb704d4418e7a9ef698164494b5a105
parent 2ade3b0bd6cbd87e1d21cd31d8d4931ebb7ce109
parent b7cfdd89b197ea9440bef558987202f5411ef762
author Baligh Uddin <baligh@google.com> 1405970234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970234 +0000

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

* commit 'b7cfdd89b197ea9440bef558987202f5411ef762':
  Remove deprecated locales - DO NOT MERGE