tree 683af2b9387b2a1ecb3803939318338bb5b6ae54
parent 21890da2d808386ec7e8b322f8f033a0b63906d1
parent ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7
author Geoff Mendal <mendal@google.com> 1454429805 +0000
committer android-build-merger <android-build-merger@google.com> 1454429805 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: ef9f2cbc84  -s ours

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