Katie McCormick
|
0cb9cf3c31
|
resolved conflicts for merge of eaf84a3f to master
Change-Id: I6282f109116d6ffc63c8fe1d6ea18f8e25ae35f3
|
2012-08-07 15:08:04 -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 |
|
The Android Open Source Project
|
0132368c2d
|
Revert "am a21a6075: Reconcile with jb-mr1-release"
This reverts commit 27a2c8495816553cbbf120af8096b9e9f01ed11c, reversing
changes made to 905272a439b396161a1e2368fa49e1747cb24143.
|
2012-07-31 10:58:38 -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
|
2a17520fba
|
Merge "Doc update: GCM doc cleanup." into jb-dev
|
2012-07-10 14:27:42 -07:00 |
|
Katie McCormick
|
7cd6dcd2f8
|
Doc update: GCM doc cleanup.
Change-Id: Ie84a6ebdd12a05c8dbe1fff97539aea90c93554c
|
2012-07-10 14:07:08 -07:00 |
|
Siva Velusamy
|
4605a039ec
|
Fix Minor typos
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
|
2012-06-29 17:49:55 -07:00 |
|
Katie McCormick
|
76c6d86b5e
|
Doc update: Adding new GCM docs.
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
|
2012-06-26 14:55:45 -07:00 |
|