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
This commit is contained in:
Jon Miranda committed 2017-08-22 13:52:19 -04:00
commit dff92fe1aa
162 files changed
+3048 -1358

No files matched your search

@@ -71,10 +71,6 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
return result;
}
public static boolean matches(AppInfo info, String query) {
return matches(info, query, StringMatcher.getInstance());
}
public static boolean matches(AppInfo info, String query, StringMatcher matcher) {
int queryLength = query.length();