tree 7a8b3ed48494b5c24f2015d463a44804575e9e1a
parent 5c8970eb145702e302aede2a44132b28b0d6049b
parent b9ee1913a1a1fe8dd04e4def69908e41ccca35ce
author Bill Yi <byi@google.com> 1482369446 +0000
committer android-build-merger <android-build-merger@google.com> 1482369446 +0000

Import translations. DO NOT MERGE am: dfb6ca8235  -s ours
am: b9ee1913a1  -s ours

Change-Id: I751912ee82bbbddd0f27e087a89b6fcd9c797313