tree 0c28d85faf9c050f4310f7b318395350f7180dc5
parent 34f5f2871e918aee0ec8be9dfe890da5bfc3f81f
parent 08e8f5a8c82a180f80920580e0d295709f261a1f
author Michael Kolb <kolby@google.com> 1363108338 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363108338 -0700

am 08e8f5a8: am ef21ad78: Merge "es_ES: Fix spanish translations"

* commit '08e8f5a8c82a180f80920580e0d295709f261a1f':
  es_ES: Fix spanish translations