tree 83b76d149dd985d7087d90ca03a257d923c000a1
parent 07a277092a3741b2d0ffd04995f95a583910635b
parent 26aab820630b3b7c63a38984bc5d3da16d479bc8
author Geoff Mendal <mendal@google.com> 1414480349 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414480349 +0000

am 26aab820: (-s ours) am 58bb11e9: (-s ours) am b184b5c6: (-s ours) Import translations. DO NOT MERGE

* commit '26aab820630b3b7c63a38984bc5d3da16d479bc8':