tree 73def3b48c94e98e819856af2701e0cc598bbf80
parent 0284c102bcb386dc37a7ad8ea32bbaff803add0c
parent af91bfbc040c47e73b0e04dc30f51ff8a9864039
author Geoff Mendal <mendal@google.com> 1440706952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440706952 +0000

am af91bfbc: (-s ours) am 96edc4c8: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE

* commit 'af91bfbc040c47e73b0e04dc30f51ff8a9864039':