tree a05bddba554422895bca018d95b248dbd9cc344f
parent 4592cbc689f68bc55274a8da1c708419bca9eecd
parent 090283cfff2a09f1ea960fd2ef87564099027ab0
author Baligh Uddin <baligh@google.com> 1405970231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970231 +0000

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

* commit '090283cfff2a09f1ea960fd2ef87564099027ab0':
  Remove deprecated locales - DO NOT MERGE