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

Commit c8ae454b 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

Change-Id: I51399455ab8809315ad1c859304983f84df5ee75
parents 93b26da8 86983ac0

Android.bp

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

    metalava_annotations_enabled: true,

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

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

    metalava_merge_annotations_dirs: [

    metalava_merge_annotations_dirs: [

        "tools/metalava/manual",

        "metalava-manual",

    ],

    ],

}

}