tree 0bc41d2c0374fa6279db22a9c2995d0c87d961c2
parent a4607963dbaa5aad278d3d9fa01a8a50e9d3caaf
parent 8268a4c790c65bd281ccddc05d272594e4194431
author Baligh Uddin <baligh@google.com> 1405970229 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970229 +0000

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

* commit '8268a4c790c65bd281ccddc05d272594e4194431':
  Remove deprecated locales - DO NOT MERGE