sync with master

justinmc · Jul 7, 2020 · a0f9a3e · a0f9a3e
2 parents 5b35f21 + 05da783
commit a0f9a3e
Show file tree

Hide file tree

Showing 1,226 changed files with 46,756 additions and 34,683 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ platform_tools/android/apps/build
 platform_tools/android/apps/*.properties
 platform_tools/android/apps/*/build
 platform_tools/android/apps/*/src/main/libs
+platform_tools/android/apps/*/*/src/main/libs
 platform_tools/android/apps/*.hprof
 platform_tools/android/apps/*/.externalNativeBuild
 

diff --git a/AUTHORS b/AUTHORS
@@ -50,6 +50,7 @@ Shachar Langbeheim <nihohit@gmail.com>
 Skia <*@skia.org>
 Skia Buildbots <skia.buildbots@gmail.com>
 Sony Mobile Communications Inc. <*@sonymobile.com>
+Stephan Hartmann <stha09@googlemail.com>
 Steve Singer <steve@ssinger.info>
 Sylvestre Ledru <sylvestre.ledru@gmail.com>
 The Chromium Authors <*@chromium.org>