| commit | 2f8caf6a74c5d6bcddbc4fae57945c83e85788bd | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Apr 11 12:03:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 12:03:54 2013 -0700 |
| tree | 9e9e782005c693b53edfd65bef58b70bbc2d72e4 | |
| parent | 0b234469bfc45006c10297fb95206c50260a21da [diff] | |
| parent | dac80f633977308ec87cca1dea802e81d0fb75ad [diff] |
am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev * commit 'dac80f633977308ec87cca1dea802e81d0fb75ad': add api level 18 to javadoc 'since' tags
diff --git a/Android.mk b/Android.mk index 4fc7210..09f1028 100644 --- a/Android.mk +++ b/Android.mk
@@ -443,6 +443,7 @@ -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