11 Commits

Author SHA1 Message Date
Katie McCormick
fd2ccaffc7 am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev
* commit 'd21b9a9e2192e1a1803c2a19290e6badc7f69caf':
  Doc change: GCM changes
2012-09-13 09:41:57 -07:00
Katie McCormick
4e11e3e962 Doc change: GCM changes
Bug: 7072792

Change-Id: I718e407647571d093996139b857f703c104d4e4d
2012-09-12 14:05:34 -07:00
Katie McCormick
03a429ddcd resolved conflicts for merge of 9447af12 to jb-mr1-dev
Change-Id: I5b5f086dd27a8c567b27fb9a7799b0552a8e0ae4
2012-08-23 14:47:51 -07:00
Katie McCormick
c44ba477b3 Doc update: client javadoc fix for @value.
Change-Id: I9e1327a21d0755fc10b4e5cb4aa9ecd30053b6ef
2012-08-22 13:56:17 -07:00
Katie McCormick
e5cefd1d52 cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

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

Conflicts:

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

Change-Id: I584ba81e923d4150d2b4aed940d790c8298bae7c
2012-08-07 13:00:10 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

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

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
2012-08-01 14:55:22 -07:00
Katie McCormick
613d0b1253 Doc update: Misc minor GCM updates.
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd
2012-08-01 13:45:15 -07:00
Katie McCormick
2d9702e778 Doc Update: JSON must be string data only.
Change-Id: I63c240dde0ce245d32612464d9ebeb790c9be6ca
2012-07-23 13:06:57 -07:00
Katie McCormick
60c8f99619 Doc update: GCM doc cleanup, continued.
Change-Id: Ia668bc6b80b5d53c9fa815db888e75d8efbbc772
2012-07-16 14:55:53 -07:00
Katie McCormick
507c3129eb Doc change: New TTL error code.
Change-Id: I99844d28243e0d6592219f532db08855d73f338e
2012-07-11 10:25:13 -07:00
Katie McCormick
76c6d86b5e Doc update: Adding new GCM docs.
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
2012-06-26 14:55:45 -07:00