Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a429dd authored by Katie McCormick's avatar Katie McCormick
Browse files

resolved conflicts for merge of 9447af12 to jb-mr1-dev 

Change-Id: I5b5f086dd27a8c567b27fb9a7799b0552a8e0ae4
parents 11a03afa 9447af12

docs/html/guide/google/gcm/adv.jd

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ registerReceiver(mRetryReceiver, filter); 
  <li>The end user uninstalls the application.</li>

  <li>The 3rd-party server sends a message to GCM server.</li>

  <li>The GCM server sends the message to the device.</li>

  <li>The GCM client receives the message and queries Package Manager, which returns a &quot;package not found&quot; error.</li>

  <li>The GCM client receives the message and queries Package Manager about whether there are broadcast receivers configured to receive it, which returns <code>false</code>.

</li>

  <li>The GCM client informs the GCM server that the application was uninstalled.</li>

  <li>The GCM server marks the registration ID for deletion.</li>

  <li>The 3rd-party server sends a message to  GCM.</li>

docs/html/guide/google/gcm/client-javadoc/allclasses-frame.html

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
<!--NewPage-->

<HTML>

<HEAD>

<!-- Generated by javadoc (build 1.6.0_26) on Mon Jul 16 14:13:37 PDT 2012 -->

<!-- Generated by javadoc (build 1.6.0_26) on Wed Aug 22 13:22:47 PDT 2012 -->

<TITLE>

All Classes

</TITLE>



<META NAME="date" CONTENT="2012-07-16">

<META NAME="date" CONTENT="2012-08-22">



<LINK REL ="stylesheet" TYPE="text/css" HREF="default.css" TITLE="Style">

docs/html/guide/google/gcm/client-javadoc/allclasses-noframe.html

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
<!--NewPage-->

<HTML>

<HEAD>

<!-- Generated by javadoc (build 1.6.0_26) on Mon Jul 16 14:13:37 PDT 2012 -->

<!-- Generated by javadoc (build 1.6.0_26) on Wed Aug 22 13:22:47 PDT 2012 -->

<TITLE>

All Classes

</TITLE>



<META NAME="date" CONTENT="2012-07-16">

<META NAME="date" CONTENT="2012-08-22">



<LINK REL ="stylesheet" TYPE="text/css" HREF="default.css" TITLE="Style">

docs/html/guide/google/gcm/client-javadoc/com/google/android/gcm/GCMBaseIntentService.html

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
<!--NewPage-->

<HTML>

<HEAD>

<!-- Generated by javadoc (build 1.6.0_26) on Mon Jul 16 14:13:36 PDT 2012 -->

<!-- Generated by javadoc (build 1.6.0_26) on Wed Aug 22 13:22:47 PDT 2012 -->

<TITLE>

GCMBaseIntentService

</TITLE>



<META NAME="date" CONTENT="2012-07-16">

<META NAME="date" CONTENT="2012-08-22">



<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../default.css" TITLE="Style">

docs/html/guide/google/gcm/client-javadoc/com/google/android/gcm/GCMBroadcastReceiver.html

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
<!--NewPage-->

<HTML>

<HEAD>

<!-- Generated by javadoc (build 1.6.0_26) on Mon Jul 16 14:13:36 PDT 2012 -->

<!-- Generated by javadoc (build 1.6.0_26) on Wed Aug 22 13:22:47 PDT 2012 -->

<TITLE>

GCMBroadcastReceiver

</TITLE>



<META NAME="date" CONTENT="2012-07-16">

<META NAME="date" CONTENT="2012-08-22">



<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../default.css" TITLE="Style">