commit | dff92fe1aa90dfad1cce228ee140a70ab7a365b2 | [log] [tgz] |
---|---|---|
author | Jon Miranda <jonmiranda@google.com> | Tue Aug 22 13:42:47 2017 -0400 |
committer | Jon Miranda <jonmiranda@google.com> | Tue Aug 22 13:52:19 2017 -0400 |
tree | d079f20d40107acf9056d049817318e85ec44bbb | |
parent | 9623a6f891a31f1285f360baf77beb335613e7f5 [diff] | |
parent | 78356a542e14ad6eefd5288506d1e53f601257f6 [diff] |
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