tree 32868b745f46bafa6b74039a4fe7c2ff0aa2dcf0
parent 9657c0333f73d76e1bae6da2a64fce1339ebbc26
parent f3b8f7afa14542a5d786d6b44a22eb3334c87022
author Eric Fischer <enf@google.com> 1335986669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335986669 -0700

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

* commit 'f3b8f7afa14542a5d786d6b44a22eb3334c87022':
  Import translations. DO NOT MERGE