tree 171a2aedbd2d156f1c99f8c964903240275256f5
parent f49df144247e686ffa64daed433614e5359a2825
parent d5d42d68d5a4f411de52211e07b5167fc3954693
author TreeHugger Robot <treehugger-gerrit@google.com> 1501098779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501098779 +0000

Merge changes from topic 'am-ded7a157-9830-4582-982e-e6d972cee19b' into ub-launcher3-master

* changes:
  [automerger] Import translations. DO NOT MERGE skipped: 119bb836b4 skipped: 323633a57a
  [automerger] Import translations. DO NOT MERGE skipped: 119bb836b4
  Import translations. DO NOT MERGE