tree 2941d0f9027c379e1825272f5c5570588aeb2602
parent e41b0705eedb71bbe8b8f4768553ac7e1c7cea76
parent d0c5d246c8074d59ede0e4fcc32ca5c0405412f4
author Bill Yi <byi@google.com> 1476981672 +0000
committer android-build-merger <android-build-merger@google.com> 1476981672 +0000

Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours am: 4559d2bfac  -s ours
am: d0c5d246c8  -s ours

Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4