tree 3e86f64e8f4dd7356ddf326dc735186ab0333bda
parent d2a12ffb2974a33bf17768da210e2fcbed260087
parent 3a1bec7197844423a5ce69753399e7b98d83bcfb
author Bill Yi <byi@google.com> 1501111644 +0000
committer android-build-merger <android-build-merger@google.com> 1501111644 +0000

Import translations. DO NOT MERGE
am: 3a1bec7197  -s ours

Change-Id: I260e2031a4ede52996e8086b6c8ad5f05b44c9d1