tree bdf2ccff92fac03b4f806e26d439dfeb9d3e247c
parent ebd0ba1bc4de032481c7b32400780b67bc820599
parent d6c7523ce3230346605e5d73c0fc279a32086a9a
author Bill Yi <byi@google.com> 1470781992 +0000
committer android-build-merger <android-build-merger@google.com> 1470781992 +0000

Import translations. DO NOT MERGE am: b4960d2ce6  -s ours am: 4881f571d3  -s ours am: c70aaaca99  -s ours
am: d6c7523ce3  -s ours

Change-Id: I4bffbc04fa9210a9152e17f651aaa7593c735340