tree 9a6acfd017475834be1dd6347125bcd02b21743a
parent b914977e47adda81a85dee1f00368d9e5cd14dd7
parent 186bb306375c8d455f6503c60960faf3b4011ccd
author Geoff Mendal <mendal@google.com> 1458569246 +0000
committer android-build-merger <android-build-merger@google.com> 1458569246 +0000

Import translations. DO NOT MERGE am: e25bfb8  -s ours am: 033ec5d  -s ours am: 2ac9cf5  -s ours
am: 186bb30  -s ours

* commit '186bb306375c8d455f6503c60960faf3b4011ccd':
  Import translations. DO NOT MERGE