tree ec3f47bca32b7d77a1cd64c1f0c636dc8e098a8f
parent 9534f0c4f6892499dcd0c29b5f8b473c8dea63f7
parent 5fdf2a79cdcaf2fe44769e8fcaf21ca02261b0a2
author Bill Yi <byi@google.com> 1508206391 +0000
committer android-build-merger <android-build-merger@google.com> 1508206391 +0000

Import translations. DO NOT MERGE am: 9aedbb0773  -s ours am: b4d9176e36  -s ours am: 0a130a0e4d  -s ours
am: 5fdf2a79cd  -s ours

Change-Id: I02f22421b858faa415f4bdcd03637206b666530e