am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs

* commit '34aab81a255545a029dc436bd63dd275a6ef3aa5':
  add information about required meta-data for gcore bug: 11553131

docs/html/google/play-services/setup.jd

@@ -110,6 +110,14 @@ dependencies {
 <img src="{@docRoot}images/tools/sync-project.png" style="vertical-align:bottom;margin:0;height:19px" />
 in the toolbar.
   </li>
+  <li>Open your app's manifest file and add the following tag as a child of the <a
+href="{@docRoot}guide/topics/manifest/application-element.html">{@code &lt;application>}</a>
+element:
+<pre>
+&lt;meta-data android:name="com.google.android.gms.version"
+           android:value="&#64;integer/google_play_services_version" />
+</pre>
+  </li>
 </ol>
 
 <p>You can now begin developing features with the
@@ -129,6 +137,16 @@ Library Project on the Command Line</a> for more information on how to do this.<
 You should be referencing a copy of the library that you copied to your development
 workspace&mdash;you should not reference the library directly from the Android SDK directory.</p>
 
+<p>After you've added the Google Play services library as a dependency for your app project,
+open your app's manifest file and add the following tag as a child of the <a
+href="{@docRoot}guide/topics/manifest/application-element.html">{@code &lt;application>}</a>
+element:
+<pre>
+&lt;meta-data android:name="com.google.android.gms.version"
+           android:value="&#64;integer/google_play_services_version" />
+</pre>
+
+
 <p>Once you've set up your project to reference the library project,
 you can begin developing features with the
 <a href="{@docRoot}reference/gms-packages.html">Google Play services APIs</a>.</p>