tree 7562be5209128fea7a78df4405637eb84f2585a9
parent 8de82f90164f7365c268cc1d6b908263c0a436f8
parent 807adcb71e2005da1f93d8b1b44b8262fc1ec1a5
author Bill Yi <byi@google.com> 1491105947 +0000
committer android-build-merger <android-build-merger@google.com> 1491105947 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479  -s ours am: bdf8a3106c  -s ours
am: 807adcb71e  -s ours

Change-Id: Ie7dae1fb734dcc8d18edf0e057ba460e86d67233