tree 7a8b3ed48494b5c24f2015d463a44804575e9e1a
parent 83fe32be0692564a2f271bb66b07d5632f8d0c97
parent 529015a5caed9ad98a696a0089f5adcacaa92f17
author Bill Yi <byi@google.com> 1482369476 +0000
committer android-build-merger <android-build-merger@google.com> 1482369476 +0000

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

Change-Id: I8950ae991cac7e566d1d42d5034f9a5e8db3c4ce