tree 374ec31cb49cdf2d73e22d3b474ba0c417fb1ea3
parent b5def6df3173775a43733f55227b5cb371fd854f
parent eed665acfd9698b3622cf4c7355929b32e1fd15e
author Bill Yi <byi@google.com> 1508520519 +0000
committer android-build-merger <android-build-merger@google.com> 1508520519 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461  -s ours am: 33b0f435de  -s ours
am: eed665acfd  -s ours

Change-Id: Icdfc1004381d27021fd9ff5d9f257b575143f07f