tree 71699c7e54d90a119df4039851804ffc096bf570
parent 9f2a5948f495fc46cb55b7fb853008b9d14a5160
parent ea777404c4457ecc1026d19727fab0cf7a21088a
author Geoff Mendal <mendal@google.com> 1450284435 +0000
committer android-build-merger <android-build-merger@google.com> 1450284435 +0000

Import translations. DO NOT MERGE am: fb7517dcf9  -s ours am: 56c9eefcf8  -s ours am: e49a7169f4  -s ours
am: ea777404c4  -s ours

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