tree 82f93790407f55dd3e2c6556766069837fe8c0bc
parent c999d0d55d2358c3192160cba55caa4c28361d6d
parent 8c352f1e267656dcf7ad9c14d3d00ca772dce06b
author Android Build Merger (Role) <android-build-merger@google.com> 1498594549 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498594555 +0000

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours am: fb1469df92  -s ours" into oc-dr1-dev-plus-aosp