tree ad7123686cc9fa93932591702e8dc3320fc8afdf
parent 59c40bea05f496f11b05e4c1991f982c378afa18
parent 76b72967efa3ec5f90aa2feebc13f96b5985ab16
author Bill Yi <byi@google.com> 1502087673 +0000
committer android-build-merger <android-build-merger@google.com> 1502087673 +0000

Import translations. DO NOT MERGE am: 033375b60c  -s ours am: 7ac43e913d  -s ours am: 7877613801  -s ours
am: 76b72967ef  -s ours

Change-Id: I0a316d026421d3a4ffe200b21574f61b23fbbcd3