tree c0d3e5c1ef3b02db7deca61d05fbafa9d848a9f9
parent cbde12222f238c268e09fae980d3656e9933238b
parent 7ed42af3398c1764424ebbf2dd6e2a51e05eaf5f
author Bill Yi <byi@google.com> 1468340397 +0000
committer android-build-merger <android-build-merger@google.com> 1468340397 +0000

Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
am: 7ed42af339  -s ours

Change-Id: Idba414b9d9e31f01c14c4284aa49b56b50899243