tree 834cc544121ba873d02cb3b8066b7effe740dbae
parent 3f2d066e7cfeee1a63fb3a791195911d1428fae9
parent 2ed82937d3089b9871dcbafa7c293e85e0920302
author Bill Yi <byi@google.com> 1494503744 +0000
committer android-build-merger <android-build-merger@google.com> 1494503744 +0000

Import translations. DO NOT MERGE am: 41d38e53b8  -s ours
am: 2ed82937d3  -s ours

Change-Id: Ibd35ae7ff64941c172b948df3f9f64edb270fdae