tree 31bc62cf615240301be1c29b5ce3b91bf08f4a59
parent d069bf89e483c7d69223db27a59b623208fcc641
parent 597204719043da941b9e31e069fedb91b0729225
author Bill Yi <byi@google.com> 1466601998 +0000
committer android-build-merger <android-build-merger@google.com> 1466601998 +0000

Import translations. DO NOT MERGE am: 334a3bfa49  -s ours
am: 5972047190  -s ours

Change-Id: Ifbd844c30ca6cb151aab65d10d9b3cbde1131f32