tree fde3c6b5d176bb5b60805620b59e7a29bb6fa6be
parent 94ed8ea16ebd823fc53966b82e92bba44cb18e6e
parent 2ec8d71147c73147e9ce8f9aa25ead2c6990b31d
author Geoff Mendal <mendal@google.com> 1454432300 +0000
committer android-build-merger <android-build-merger@google.com> 1454432300 +0000

Import translations. DO NOT MERGE am: 7930d002a9  -s ours
am: 2ec8d71147  -s ours

* commit '2ec8d71147c73147e9ce8f9aa25ead2c6990b31d':
  Import translations. DO NOT MERGE