tree 54fa092893ff7953f0c1eaf5e782fff1ec5c96bf
parent 186bb306375c8d455f6503c60960faf3b4011ccd
parent d83aa19c5971e3fd7dd2fd1caca05ef7993f43ee
author Geoff Mendal <mendal@google.com> 1458570257 +0000
committer android-build-merger <android-build-merger@google.com> 1458570257 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: d83aa19  -s ours

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