tree 0892736d3c76f95c1088c4975515c13252168eec
parent a4cc0970b3d2a16bbc3ab23f8cb924c2e8c24934
parent bdba1ead7233e328e64c6c7435bfab3a82f1dadc
author Bill Yi <byi@google.com> 1486110984 +0000
committer android-build-merger <android-build-merger@google.com> 1486110984 +0000

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

Change-Id: Ia88697d0b148afd53ddc5ed30d37e4443f92ac1c