tree a9750bd4e96ef9170d2e0e104373a12ffd37663a
parent 03324466acbc0c721aa0d895262fab1b371827e1
parent 4a7404676f22a9d255f60b8bc70714d264cd1ef4
author TreeHugger Robot <treehugger-gerrit@google.com> 1494348045 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494348047 +0000

Merge changes from topic 'am-24a2c233-c915-4d01-8984-d0800fb299f6' into ub-launcher3-master

* changes:
  Import translations. DO NOT MERGE skipped: 38d2add77b
  Import translations. DO NOT MERGE