tree b91386b35d311b71ea0806f481979d05cc587fce
parent 39eb16c482d10cec29ef0849541b1062c9444ff6
parent f0e4b99bd4f4630225f1358e50b1f954130c58fe
author Geoff Mendal <mendal@google.com> 1445452338 +0000
committer android-build-merger <android-build-merger@google.com> 1445452338 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 255103a79f  -s ours
am: f0e4b99bd4  -s ours

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