tree d079f20d40107acf9056d049817318e85ec44bbb
parent 9623a6f891a31f1285f360baf77beb335613e7f5
parent 78356a542e14ad6eefd5288506d1e53f601257f6
author Jon Miranda <jonmiranda@google.com> 1503423767 -0400
committer Jon Miranda <jonmiranda@google.com> 1503424339 -0400

merged ub-launcher3-dorval-polish2, and resolved conflicts

Conflicts:
  res/values-be/strings.xml
  res/values-et/strings.xml
  res/values-ms/strings.xml

Bug: 64937210
Test: flashed img
Change-Id: I28557d652cc5a547f8b94a60a41f381a5af2fa84