tree 1eba28304864b382418414b46671ce7da6ea3d08
parent 3458e180cf1dab2be19d00758b64033061aa62d2
parent bae67d30304853ce3898b922ab0753718c89f82c
author Geoff Mendal <mendal@google.com> 1421858114 +0000
committer android-build-merger <android-build-merger@google.com> 1421858114 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: bae67d3  -s ours

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