tree 65c72a4036595fe03379b499bca2b7307551c5b0
parent 24e8c6cb897eeee16b05b897ece23894be025d8b
parent 2f860f1536a53b4dc49bfa1792d2ca56ecc03309
author Eric Fischer <enf@google.com> 1302024478 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302024478 -0700

am 2f860f15: (-s ours) am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aosp

* commit '2f860f1536a53b4dc49bfa1792d2ca56ecc03309':
  Import revised translations.  DO NOT MERGE