tree f29b5ce542443e40da5d48f67f06025b7820688b
parent 5a2a655475fb95d967a5468f98a3ea8fb82e3df9
parent 14a499aff7bddc354332e51180d6dd684a808178
author Bill Yi <byi@google.com> 1492092196 +0000
committer android-build-merger <android-build-merger@google.com> 1492092196 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval
am: 14a499aff7  -s ours

Change-Id: I7a38bb24889a07de191e80eccccd32c4ce148a8b