tree 6253faf025768d95b6c020efb1973fbd39470d5b
parent 2717f26f5989d9ab8513bb41240176a9af9ef3d3
parent e23de7376a6ecb19997aa4ae075d27252bce8694
author Geoff Mendal <mendal@google.com> 1438181215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438181215 +0000

am e23de737: (-s ours) am 7d49d182: (-s ours) am 6a7af7a6: (-s ours) am 3e9a75b7: (-s ours) Import translations. DO NOT MERGE

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