tree 0027e06bf6e90e07ffc8219e3c1a28df62f721c1
parent 9ede6b899c7b8a02183946caf40c42453a9390b4
parent e8e2377ebe8fb71efb1af6dad8d459f9aa614471
author Bill Yi <byi@google.com> 1467349112 +0000
committer android-build-merger <android-build-merger@google.com> 1467349112 +0000

Import translations. DO NOT MERGE am: 6bc410b83c  -s ours
am: e8e2377ebe  -s ours

Change-Id: I627b35cd64ca7615e0eea68e2366cfe85bc0fbc5