Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cb283f authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge branch 'mirror-aosp-master' of... 

Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d2 am: 86983ac0
am: c8ae454b

Change-Id: I6318c7081069dc2df41420a00d2378078d86a463
parents 577fa055 c8ae454b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -1569,7 +1569,7 @@ doc_defaults { 
    metalava_annotations_enabled: true,

    metalava_previous_api: ":public-api-for-metalava-annotations",

    metalava_merge_annotations_dirs: [

        "tools/metalava/manual",

        "metalava-manual",

    ],

}