tree c3ae5b03f7efa4e6234190562cc524571409f66b
parent e6021aa088875d7100dbfffaeb669989888afd17
parent cd9a844f2f833ac9888aa60c93bd3ac1ce90e442
author Bill Yi <byi@google.com> 1481217276 +0000
committer android-build-merger <android-build-merger@google.com> 1481217276 +0000

Import translations. DO NOT MERGE am: d5c297aee0  -s ours am: 8a8b2fcab7  -s ours
am: cd9a844f2f  -s ours

Change-Id: I72379746bf830c4e6f511927d52bb6525d08ae29