tree 184454233df34f44a6c3afb1e6c8d1882d1e9055
parent 22c65502069f3fc2f17690f74d0c847222c5e0f5
parent dc026bafa97ad0c2cc2446bfe8ae5992f660ed21
author Svetoslav <svetoslavganov@google.com> 1417643401 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417643401 +0000

am dc026baf: am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev

* commit 'dc026bafa97ad0c2cc2446bfe8ae5992f660ed21':
  Inconsistent media sizes for es-US locale.