am 1cbd67d9: am c7fe4b37: Merge "Fix @link annotation in documentation for hyperlink generation"

* commit '1cbd67d91edfcedbfd28aac75c1c616ced66ab4a':
  Fix @link annotation in documentation for hyperlink generation
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..463fb6b
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := org.apache.http.legacy
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under,placeholder)
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_JAVA_LIBRARY)
diff --git a/placeholder/org/apache/http/PlaceHolder.java b/placeholder/org/apache/http/PlaceHolder.java
new file mode 100644
index 0000000..20ebfc0
--- /dev/null
+++ b/placeholder/org/apache/http/PlaceHolder.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.http;
+
+public class PlaceHolder {
+}