tree b7ddda59cdcceaac67373ff4f56d2eb3dbe6591e
parent 2e797d9905df9ca3a6068a23f6ad6669b823657d
parent bdf8a3106c1d6a7e4081dbc214e1035872b50248
author Bill Yi <byi@google.com> 1491105797 +0000
committer android-build-merger <android-build-merger@google.com> 1491105797 +0000

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

Change-Id: I119864fe230b48d92caadc05ee69c008c7a35657