tree 20db03caf89960458504d9e2d5b0938e99550084
parent 27960806a3a5aa9caf0d6dfb20ef5a2046bba13e
parent 6aefd8d2cb2476b968687f9c1cf48f9b99390f67
author Geoff Mendal <mendal@google.com> 1437573004 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437573004 +0000

am 6aefd8d2: (-s ours) am a7e9bc63: (-s ours) Import translations. DO NOT MERGE

* commit '6aefd8d2cb2476b968687f9c1cf48f9b99390f67':
  Import translations. DO NOT MERGE