commit 8f5c409d982895bbb6e91dc8c106fae3bdb3cb3a
author Rich Sloager <rslogar@google.com> Mon Aug 17 16:07:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 17 16:07:09 2015 +0000
tree f4a51ac170144752203c20fd9a57ee498a74f19b
parent 7fb18f187ddef4d22ba32accf90ffbd9bee35e4d
parent c45a4f7a4050d38d7b3828a84ef1c7b34e2a257c

am c45a4f7a: am ea483d71: am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs

* commit 'c45a4f7a4050d38d7b3828a84ef1c7b34e2a257c':
  docs: studio 1.3 manifest merger update

docs/html/tools/building/manifest-merge.jd

diff --git a/docs/html/tools/building/manifest-merge.jd b/docs/html/tools/building/manifest-merge.jd
index 54166ec..2253584 100644
--- a/docs/html/tools/building/manifest-merge.jd
+++ b/docs/html/tools/building/manifest-merge.jd
@@ -303,7 +303,12 @@
 
 <p class="note"><strong>Note:</strong> Android Studio provides a default
 <code>&#36;{applicationId}</code> placeholder for the <code>build.gradle</code>
-<code>applicationId</code> value that is not shown in the build file.</p>
+<code>applicationId</code> value that is not shown in the build file.
+When building an AAR (Android ARchive) package for library modules, do not provide an
+automatic <code>&#64;{applicationId}</code> placeholder in the
+<a href="{@docRoot}tools/building/manifest-merge.html">manifest merge</a> settings.
+Instead, use a different placeholder, such as <code>&#64;{libApplicationId}</code> and
+provide a value for it if you want to include application Ids in the archive library. </p>
 
 
 <p>Manifest entry:</p>