tree 62d787e248df0cf368e0546c1926f772c2fe0f99
parent 0ccbbfa9901427085808bf8c7ffc7a6e5d20bf49
parent 1536c4ed80048eff8920a59ae093d483466a25dd
author Bill Yi <byi@google.com> 1512079872 +0000
committer android-build-merger <android-build-merger@google.com> 1512079872 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1536c4ed80  -s ours

Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517