tree 33f4efd37da52c0cfc6b9dad5101ec6c53bcf5e2
parent 4b50f0489d47f5a66956687f984567d8932d5977
parent 2cec69912b907173579f74a3c41a0f2ff5881b3e
author Bill Yi <byi@google.com> 1501939620 +0000
committer android-build-merger <android-build-merger@google.com> 1501939620 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 2cec69912b  -s ours

Change-Id: I1e0cd489a94043572f1742bd39c4a12ce2d97b99