tree 76ff5be3abf7f2abddd0b7bd61be625057cfaefe
parent 45dda7897f24c7a64cc8dc7a60ce9961a82f3003
parent bbf9af0cf19e34863d0d6a2c3b7d605207570f75
author Geoff Mendal <mendal@google.com> 1395089441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395089441 +0000

am bbf9af0c: (-s ours) am 6ab691b6: (-s ours) am f57c1564: (-s ours) Import translations. DO NOT MERGE

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