tree 5bc4d44e48c5569cb059e708a3e8df016c11d164
parent 7be72fbadc09b004599ed4dc0406326dd3e1b131
parent 12355258d7d764109dc3d1b0fd0604d9b2cf2a0c
author Bill Yi <byi@google.com> 1483094130 +0000
committer android-build-merger <android-build-merger@google.com> 1483094130 +0000

Import translations. DO NOT MERGE am: 6173d397d2  -s ours am: 3e026f92cf  -s ours
am: 12355258d7  -s ours

Change-Id: Ib6dfaac939a21c790db706f5b458225b6e9df1c2