tree 2f869dd7c867c13a6c030b8885529097ee4705bd
parent 3e64b7ba03c3efddd580f6099abd443a481fe1f5
parent ace0a2c0d4ad1e65dcc66c789c1ac42437bb8201
author Eric Fischer <enf@google.com> 1317254466 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317254466 -0700

am ace0a2c0: (-s ours) Import revised translations.  DO NOT MERGE.

* commit 'ace0a2c0d4ad1e65dcc66c789c1ac42437bb8201':
  Import revised translations.  DO NOT MERGE.