tree 62d787e248df0cf368e0546c1926f772c2fe0f99
parent ae57527637d08aa641e66a86201efc57cb2dbf31
parent c168312e92574e8955c6a9ec2f2cf9e7ed732c7b
author Bill Yi <byi@google.com> 1512078449 +0000
committer android-build-merger <android-build-merger@google.com> 1512078449 +0000

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

Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b