tree e166cb4756c401e4bf9816e315d60ed0e36ef324
parent 3ac2a07a5fada26fc6f50afeab0973ed5dd0dff0
parent 37c00ffe14c5fe9c6c0fb4ed48e6957919cfccad
author Geoff Mendal <mendal@google.com> 1456931724 +0000
committer android-build-merger <android-build-merger@google.com> 1456931724 +0000

Import translations. DO NOT MERGE
am: 37c00ffe14  -s ours

* commit '37c00ffe14c5fe9c6c0fb4ed48e6957919cfccad':
  Import translations. DO NOT MERGE