tree 7a8b3ed48494b5c24f2015d463a44804575e9e1a
parent 3c774bdbf5dd6201d97789345faaf8cf9e5d94c7
parent 3e026f92cf5fce172981d122bdf5c956d9346792
author Bill Yi <byi@google.com> 1483093678 +0000
committer android-build-merger <android-build-merger@google.com> 1483093678 +0000

Import translations. DO NOT MERGE am: 6173d397d2  -s ours
am: 3e026f92cf  -s ours

Change-Id: I65ed28f8a788bd1aeebaf8242f542fa698e967a4