tree 7a1738a1a9f8bcd43e1442d648a7e06c92977ddd
parent da5dfba1d081f77b7e9460d0fc1bcb1e685d3f66
parent 133c6574810a7fb3d7a394e4f505027ebfd5ba01
author Eric Fischer <enf@google.com> 1320281008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320281008 +0000

am 133c6574: (-s ours) am f94f62f0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '133c6574810a7fb3d7a394e4f505027ebfd5ba01':
  Import revised translations.  DO NOT MERGE