Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31

Android 10.0.0 release 31

* tag 'android-10.0.0_r31':
  Revert "DO NOT MERGE Set module versions to 299900000"
  DO NOT MERGE Set module versions to 299900000 Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules.
  add java_api_finder plugin to mainline module CaptivePortalLogin to generate java APIs used by CaptivePortalLogin.

Change-Id: I26d6b6b2dd890e558a35917ca37e0ccc1660b756

1 files changed, 1 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 1f6c2ae..9662efe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,7 @@ java_defaults {
         "captiveportal-lib",
     ],
     manifest: "AndroidManifest.xml",
+    plugins: ["java_api_finder"],
 }
 
 android_app {