tree 9c8309876d58ee27a6ea6bf1dc18e9a3ad2ffcde
parent d018c892a6c8347dcce0cdb1140102c54141d314
parent f5c3a70042340c355f7533c14e4b4045cd3af685
author Geoff Mendal <mendal@google.com> 1439987717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439987717 +0000

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

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