merge in oc-r6-release history after reset to oc-release

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b5f8cb0..3f2ae83 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -923,6 +923,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -android \
     -knowntags ./frameworks/base/docs/knowntags.txt \
     -knowntags ./libcore/known_oj_tags.txt \
+    -manifest ./frameworks/base/core/res/AndroidManifest.xml \
     -hidePackage com.android.org.conscrypt \
     -since $(SRC_API_DIR)/1.xml 1 \
     -since $(SRC_API_DIR)/2.xml 2 \