diff options
| author | Robert Ly <robertly@google.com> | 2014-06-29 17:55:24 -0700 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2014-06-29 17:55:24 -0700 |
| commit | bc2b05299d5fb369aa5c912ccad8e8e3ade06d90 (patch) | |
| tree | c7da007c1eadd5a0b63ecd9691e629bee070ac0c /Android.mk | |
| parent | 05759ef766b85a2987bcd8c92d246b186a6ddded (diff) | |
| parent | 4d329a8f12253ed514ca422922e34d41fee29e77 (diff) | |
| download | frameworks_base-bc2b05299d5fb369aa5c912ccad8e8e3ade06d90.zip frameworks_base-bc2b05299d5fb369aa5c912ccad8e8e3ade06d90.tar.gz frameworks_base-bc2b05299d5fb369aa5c912ccad8e8e3ade06d90.tar.bz2 | |
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp
Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -535,7 +535,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/17.txt 17 \ -since $(SRC_API_DIR)/18.txt 18 \ -since $(SRC_API_DIR)/19.txt 19 \ - -werror -hide 111 -hide 113 \ + -since $(SRC_API_DIR)/20.txt 20 \ + -werror -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ |