tree 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446
parent 4c2556888488311baaf9f2fee54d01c29ed913c2
parent eb37d17be446424308e683dae86fcdd43e1c181d
author Bill Yi <byi@google.com> 1486115221 +0000
committer android-build-merger <android-build-merger@google.com> 1486115221 +0000

Import translations. DO NOT MERGE
am: eb37d17be4  -s ours

Change-Id: I0879a32b3fea8f57250b525a71585a59f61342a0