tree 1d7d140a02fbb421c264d8bd24a0f5c6e6f0fe90
parent 7de4cda003f09da0a5b061c9572abe5cc270cc86
parent 8db7d68aaccb58a646d24080d3fa7e093900e11b
author Bill Yi <byi@google.com> 1467775321 +0000
committer android-build-merger <android-build-merger@google.com> 1467775321 +0000

Import translations. DO NOT MERGE
am: 8db7d68aac  -s ours

Change-Id: If6812a764bc5d893ee1b08a7ec69bf9e1736c1c2