diff options
| author | Scott Main <smain@google.com> | 2013-04-11 14:58:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 14:58:01 -0700 |
| commit | c541ca0d68bdb2a07d93fa8f49bb0a14524fb1f3 (patch) | |
| tree | 19e16f00c81728bfbffd81c9be077ff29a9e8ced | |
| parent | 0fe79c0fe4b896bef1dcf8598d9fd0c2a64d7607 (diff) | |
| parent | 2f8caf6a74c5d6bcddbc4fae57945c83e85788bd (diff) | |
| download | frameworks_base-c541ca0d68bdb2a07d93fa8f49bb0a14524fb1f3.zip frameworks_base-c541ca0d68bdb2a07d93fa8f49bb0a14524fb1f3.tar.gz frameworks_base-c541ca0d68bdb2a07d93fa8f49bb0a14524fb1f3.tar.bz2 | |
am 2f8caf6a: am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev
* commit '2f8caf6a74c5d6bcddbc4fae57945c83e85788bd':
add api level 18 to javadoc 'since' tags
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -446,6 +446,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/15.txt 15 \ -since $(SRC_API_DIR)/16.txt 16 \ -since $(SRC_API_DIR)/17.txt 17 \ + -since $(SRC_API_DIR)/18.txt 18 \ -werror -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html |