tree da3ae650746d659be2d59f54ca36b13ba1b41620
parent d4d048e65af5e08661eaf8673a87108881aa67e0
parent 9cfcb39bffaffe2123cc6e6a39b4e32ee440fda5
author Eric Fischer <enf@google.com> 1335549235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335549235 -0700

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

* commit '9cfcb39bffaffe2123cc6e6a39b4e32ee440fda5':
  Import translations. DO NOT MERGE