tree c00517705f3f1385aea2970957c1bb414eccd005
parent 264413cc5b6b60d5650c7145a4c1ec0d9a76c67f
parent 5426e6ac1b17fa370cb059f7864b11b5a53e1950
author Eric Fischer <enf@google.com> 1316561184 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316561184 -0700

am 5426e6ac: (-s ours) am de4d956f: (-s ours) Import revised translations.  DO NOT MERGE

* commit '5426e6ac1b17fa370cb059f7864b11b5a53e1950':
  Import revised translations.  DO NOT MERGE