tree 25e090f9cc465aea0761ee721fcde3aadf0f3556
parent de705ff417e8ea18602a7275f1146326f9404f5c
parent c2b38be10fcd37b1cbc4d5bdd612721c4164f8f3
author Bill Yi <byi@google.com> 1470421924 +0000
committer android-build-merger <android-build-merger@google.com> 1470421924 +0000

Import translations. DO NOT MERGE am: c92d371104  -s ours
am: c2b38be10f  -s ours

Change-Id: I259a242b5481025eb5eaaaffc56a9c22f5cdc424