resolved conflicts for merge of 0b479e43 to jb-dev

Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e

diff --cc docs/html/guide/google/gcm/adv.jd
Simple merge

diff --cc docs/html/guide/google/gcm/gcm.jd
Simple merge

diff --cc docs/html/guide/google/gcm/gs.jd
index 93eb794,0749279..8d132d8
--- 1/docs/html/guide/google/gcm/gs.jd
--- 2/docs/html/guide/google/gcm/gs.jd
+++ b/docs/html/guide/google/gcm/gs.jd
@@@ -145,7 -145,8 +145,9 @@@ page.title=GCM: Getting Starte
    <li>If the value is dynamic, the service should override the <code>getSenderIds()</code> method.</li>
  </ul>
  
 -<h4>
 -  Step 3: Write the my_app_package.GCMIntentService class</h4>
++
 +<h4>Step 3: Write the my_app_package.GCMIntentService class</h4>
++
  <p>Next write the <code>my_app_package.GCMIntentService</code> class, overriding the following callback methods (which are called by <code>GCMBroadcastReceiver</code>):<br>
  </p>
  <ul>