tree 30ca740b61dce8320252ccfd42b03881bba2796c
parent b629fd454e3821e960c9bede08df7767c0def79f
parent a76010fa02ce75156aab85e18b9491d91afdfa6d
author Bill Yi <byi@google.com> 1498232848 +0000
committer android-build-merger <android-build-merger@google.com> 1498232848 +0000

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours am: 53f4db5612  -s ours" into oc-dr1-dev-plus-aosp
am: a76010fa02  -s ours

Change-Id: I682e4b95710264b8e31634aa25b934da3a2427b9