Commit Graph

56 Commits

Author SHA1 Message Date
Katie McCormick
a5259759eb am ef0eaa5e: am ed6059a2: am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
* commit 'ef0eaa5e661d9eb21974c290a121b35fc78b8bcb':
  Doc changes: misc GCM updates.
2012-10-10 17:22:50 -07:00
Katie McCormick
1dbce5f1e5 am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
* commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d':
  Doc changes: misc GCM updates.
2012-10-10 16:09:41 -07:00
Katie McCormick
fa4865f680 resolved conflicts for merge of 0b479e43 to jb-dev
Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e
2012-10-10 11:09:03 -07:00
&& repo sync -j8
0b479e4379 Merge "Doc changes: misc GCM updates." into jb-dev-docs 2012-10-10 10:34:48 -07:00
&& repo sync -j8
4fd6c20b17 Doc changes: misc GCM updates.
Change-Id: I12e7ae6c4b52b8aa54dc355d09916c3b4499f172
2012-10-09 14:30:41 -07:00
Dirk Dougherty
6429798125 am 957c30ca: am b0a8b0b8: am 3b9e7f32: am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '957c30ca730f4c6d27b7563e20f08421bda7ea80':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:45:30 -07:00
Dirk Dougherty
3b9e7f3238 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit 'fb554fc0bf46b17314df26bdfb683c580b18f214':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:39:06 -07:00
Dirk Dougherty
b049b1ef81 am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:33:53 -07:00
Dirk Dougherty
46c4b4886a Doc change: Subscriptions free trials on Google Play.
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
2012-10-09 10:17:55 -07:00
&& repo sync -j8
22702c299a Doc update: TTL change.
Change-Id: I9ddb224e51140adc712b49442dc56cb78a8be901
2012-10-03 15:38:34 -07:00
Joe Malin
6214c9c0c2 am aaa2ebdc: am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit 'aaa2ebdccec0d37a990ae45d831847f9253b8a65':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:52:29 -07:00
Joe Malin
fd3398c8bf am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:48:58 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:43:38 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
2012-09-26 12:36:50 -07:00
Scott Main
d5abc5586e docs: update for multi apk doc for ABI support 2012-09-17 10:54:55 -07:00
Katie McCormick
32253f1708 am 6e822146: am fd2ccaff: am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev
* commit '6e8221460854e97dc3e5e7165e2f0375629378fb':
  Doc change: GCM changes
2012-09-13 14:12:00 -07:00
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
2f140f9692 Merge "Doc change: GCM changes" into jb-dev 2012-09-13 09:36:48 -07:00
Scott Main
9a605bcfe0 am f7b133be: am 8b9e467d: am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
* commit 'f7b133be571466a1ccea5b91c0503d6653c0cd1a':
  docs: update for multi apk doc for ABI support
2012-09-12 15:13:26 -07:00
Katie McCormick
4e11e3e962 Doc change: GCM changes
Bug: 7072792

Change-Id: I718e407647571d093996139b857f703c104d4e4d
2012-09-12 14:05:34 -07:00
Scott Main
8b9e467dfb am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
* commit 'c02b5008c109f4d3057de1bab8b7ac0478208816':
  docs: update for multi apk doc for ABI support
2012-09-11 10:53:24 -07:00
Scott Main
bd4a708735 docs: update for multi apk doc for ABI support
Change-Id: I6ef9b7f4bb213dddddcf03b304ffedfd2f9e209b
2012-09-06 21:53:24 -07:00
Katie McCormick
b8701be108 am 2f5125a3: am 67de61b0: Merge "resolved conflicts for merge of 9447af12 to jb-mr1-dev" into jb-mr1-dev
* commit '2f5125a33bac6afc4d61765279c9a8716b37dc7f':
  Doc update: client javadoc fix for @value.
2012-08-23 15:56:29 -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
0cb9cf3c31 resolved conflicts for merge of eaf84a3f to master
Change-Id: I6282f109116d6ffc63c8fe1d6ea18f8e25ae35f3
2012-08-07 15:08:04 -07:00
Katie McCormick
e4fcedff53 Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 2012-08-07 14:22:17 -07:00
Scott Main
e6ec886a4b am 5fef67cb: am b53e9b42: am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
* commit '5fef67cbc8c234c5028cc91ef836fd2fb3f183af':
  docs: fix broken links and update sitemap text file
2012-08-07 14:09:53 -07:00
Scott Main
b53e9b42c3 am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
  docs: fix broken links and update sitemap text file
2012-08-07 14:05:28 -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
Scott Main
40eee61e25 docs: fix broken links
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
2012-08-06 18:04:23 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:49:38 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
2012-08-01 16:14:47 -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
Scott Main
92e218837e am e0986d3a: am b8babd68: am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit 'e0986d3a2981e4bd81aca0bcec4c6a4dbbbeb190':
  fix more broken links
2012-08-01 10:29:06 -07:00
Scott Main
b8babd6837 am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit 'bca689703da6f64bfee05dd204149d0f40762344':
  fix more broken links
2012-08-01 10:06:29 -07:00
Scott Main
f05e34a10c fix more broken links
Change-Id: If4dceab223a6c22827a0645aa5923ddc427b2b85
2012-07-31 18:25:33 -07:00
The Android Open Source Project
0132368c2d Revert "am a21a6075: Reconcile with jb-mr1-release"
This reverts commit 27a2c84958, reversing
changes made to 905272a439.
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
Dirk Dougherty
1c185c2068 Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 2012-07-17 12:14:09 -07:00
Katie McCormick
60c8f99619 Doc update: GCM doc cleanup, continued.
Change-Id: Ia668bc6b80b5d53c9fa815db888e75d8efbbc772
2012-07-16 14:55:53 -07:00
Dirk Dougherty
77cfe91777 Doc change: Fixes to IAB purchase state docs.
Change-Id: I7ae5db84c3783085e2c3fbbf3b43fab68e6e89e9
2012-07-16 10:10:56 -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
Dirk Dougherty
24a3242029 Doc change: updated numbers for Andriod. Fix gcm image path.
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
2012-07-02 15:52:25 -07:00
Siva Velusamy
4605a039ec Fix Minor typos
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
2012-06-29 17:49:55 -07:00
Robert Ly
fb2ed9869b docs: fix g+ gms description
Change-Id: Icff59207ab788c81cf8e53252813b9a207548e41
2012-06-28 08:05:20 -07:00
Scott Main
947ce39e56 Merge "docs: add landing for gcm" into jb-dev 2012-06-26 16:53:44 -07:00