tree d76780511d0de8329ef268d0ec9445f79c011d5c
parent 41c4bfdc5af6a8bed8b8b3c911b6c0429d9fa102
parent 4f099220b131ef610d7c090b2172171fab5707f5
author TreeHugger Robot <treehugger-gerrit@google.com> 1501248436 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501248436 +0000

Merge changes from topic 'am-7c4096c4-c10e-40e7-94fd-3946302d1604' into ub-launcher3-master

* changes:
  [automerger] Import translations. DO NOT MERGE skipped: 60d1fb4d9d
  Import translations. DO NOT MERGE