Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240

am: 86983ac0a8 Change-Id: I51399455ab8809315ad1c859304983f84df5ee75
2018-08-06 18:29:16 -07:00
parent 93b26da8d9 86983ac0a8
commit c8ae454bfd
1 changed files with 1 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -1562,7 +1562,7 @@ doc_defaults {
    metalava_annotations_enabled: true,
    metalava_previous_api: ":public-api-for-metalava-annotations",
    metalava_merge_annotations_dirs: [
-        "tools/metalava/manual",
+        "metalava-manual",
    ],
 }