tree 9ab022d543b5db33493e73994bbbb5cff5da3902
parent 970308026767a9354e9cb609878c3ac26e63b11c
parent 3b152dec578b0484c979de779c3d32f62562fa6f
author Geoff Mendal <mendal@google.com> 1440711531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711531 +0000

am 3b152dec: (-s ours) am c6f21ce0: (-s ours) am dcb985ea: (-s ours) Import translations. DO NOT MERGE

* commit '3b152dec578b0484c979de779c3d32f62562fa6f':