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
|
8a7947f85b
|
am 4ef34ea3: am a335b06c: am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '4ef34ea30ab60208a9fbf32aef4d5bb66aaf3ac4':
docs: fix hdef variable
|
2012-08-07 14:09:57 -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
|
a335b06c67
|
am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '9e28fa459bac0322a5608a4f6c682e0ff9051bed':
docs: fix hdef variable
|
2012-08-07 14:05:32 -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 |
|
Scott Main
|
9e28fa459b
|
am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
docs: fix hdef variable
|
2012-08-07 14:04:09 -07:00 |
|
Scott Main
|
a8583c2934
|
am 40eee61e: docs: fix broken links and update sitemap text file
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
docs: fix broken links and update sitemap text file
|
2012-08-07 14:04:04 -07:00 |
|
Scott Main
|
0d3a127742
|
Merge "docs: fix hdef variable" into jb-dev
|
2012-08-07 14:01:34 -07:00 |
|
Scott Main
|
b111b5785e
|
docs: fix hdef variable
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
|
2012-08-07 13:59:12 -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 |
|
Scott Main
|
819ca9768b
|
am 09ec6aba: am 1398102c: am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about
* commit '09ec6aba00d15bc19a92303d0ed181d0eef4bfc6':
misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
|
2012-08-06 16:01:51 -07:00 |
|
Scott Main
|
1398102c35
|
am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit 'bd24f5cca5e51ba0e819f943b981cf2e9f64ec46':
misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
|
2012-08-06 15:57:53 -07:00 |
|
Scott Main
|
bd24f5cca5
|
am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
|
2012-08-06 15:48:08 -07:00 |
|
Scott Main
|
53b0fda5fd
|
misc doc bugs.
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page
Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
|
2012-08-06 15:43:01 -07:00 |
|
Dirk Dougherty
|
9b060ff52d
|
am 06faa929: am 66779511: am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '06faa929adc9179679ecd0c35856975cb957461d':
Doc change: add trademarks attribution.
|
2012-08-02 15:47:55 -07:00 |
|
Dirk Dougherty
|
6677951135
|
am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
Doc change: add trademarks attribution.
|
2012-08-02 15:39:55 -07:00 |
|
Scott Main
|
c2c6cee6b5
|
am a99c569b: am 26ea2e5d: am 80adeb53: am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit 'a99c569ba3a59c6f3949e7c39baa121519e12de7':
fix markup for gl pie
|
2012-08-02 15:10:20 -07:00 |
|
Dirk Dougherty
|
265eea82ae
|
am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '568db47b770cbfaacdd54914540923258cd6f847':
Doc change: add trademarks attribution.
|
2012-08-02 14:57:50 -07:00 |
|
Dirk Dougherty
|
568db47b77
|
Merge "Doc change: add trademarks attribution." into jb-dev
|
2012-08-02 13:42:17 -07:00 |
|
Scott Main
|
26ea2e5df5
|
am 80adeb53: am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '80adeb535f17331dedbbd200c99c366f34d33eeb':
fix markup for gl pie
|
2012-08-02 10:31:44 -07:00 |
|
Dirk Dougherty
|
5baafabafd
|
Doc change: add trademarks attribution.
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
|
2012-08-02 09:21:30 -07:00 |
|
Scott Main
|
cdf3d5e231
|
am 97592ec3: am c221f35d: am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit '97592ec3a5c5ee69f2a973239475579366ed8b49':
Group revert of the following commits for design docs:
|
2012-08-01 17:24:39 -07:00 |
|
Scott Main
|
80adeb535f
|
am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
fix markup for gl pie
|
2012-08-01 17:04:58 -07:00 |
|
Scott Main
|
5ae754c93a
|
Merge "fix markup for gl pie" into jb-dev
|
2012-08-01 16:59:45 -07:00 |
|
Katie McCormick
|
27ed953f63
|
am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
|
2012-08-01 16:53:12 -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 |
|
Scott Main
|
a18e0b4647
|
fix markup for gl pie
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
|
2012-08-01 16:31:19 -07:00 |
|
Katie McCormick
|
1cfe4b40d3
|
am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '9c311279726598de073314fb6059feea66957219':
Doc change: 4K -> 4kb
|
2012-08-01 16:24:25 -07:00 |
|
Katie McCormick
|
2184bae4e5
|
am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '510d817977af6761274e700178a854b9f9160d9c':
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
|
2012-08-01 16:22:31 -07:00 |
|
Katie McCormick
|
9c31127972
|
Merge "Doc change: 4K -> 4kb" into jb-dev
|
2012-08-01 16:21:53 -07:00 |
|
Katie McCormick
|
510d817977
|
am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
|
2012-08-01 16:16:22 -07:00 |
|
Katie McCormick
|
a65d0e78dd
|
Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
|
2012-08-01 16:14:47 -07:00 |
|
Katie McCormick
|
a5e150c95c
|
Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
|
2012-08-01 16:13:36 -07:00 |
|
Scott Main
|
c221f35de3
|
am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit 'a9a3c25a52e91346bb898e2d8c33f5c8fdd0295d':
Group revert of the following commits for design docs:
|
2012-08-01 16:09:29 -07:00 |
|
Scott Main
|
a9a3c25a52
|
am c9506415: Group revert of the following commits for design docs:
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
Group revert of the following commits for design docs:
|
2012-08-01 16:07:18 -07:00 |
|
Katie McCormick
|
ec4ec27ea6
|
cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
|
2012-08-01 16:01:18 -07:00 |
|
Scott Main
|
c9506415d5
|
Group revert of the following commits for design docs:
ce470e17fd
8874ab0473
bdd8d0fada
6443ca4cd9
5ac5a324b3
1edd4ae5c4
be13fa0b7a
6a681afd38
353474c0ac
2b1584c1d5
Had to revert these because they're not ready to be published.
Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
|
2012-08-01 15:51:29 -07:00 |
|
Peter Ng
|
dc8d78b5e2
|
am a5ff3e55: am 8a90d746: am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit 'a5ff3e554f393994770dad014db944c46b84791d':
new confirming page and updates to progress and iconography
|
2012-08-01 15:30:37 -07:00 |
|
Peter Ng
|
8a90d746ff
|
am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit '7bf18315505090f45cbe91ad025e772c3ea7ebc4':
new confirming page and updates to progress and iconography
|
2012-08-01 15:14:38 -07:00 |
|
Peter Ng
|
7bf1831550
|
am 2b1584c1: new confirming page and updates to progress and iconography
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
new confirming page and updates to progress and iconography
|
2012-08-01 15:12:26 -07:00 |
|
Scott Main
|
f67a03795c
|
am bd4a1041: am 4861668e: am c82875e4: am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'bd4a10411aa1ffe54f910010347ab67fdc28905d':
dashboard update for 8/1
|
2012-08-01 14:56:02 -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 |
|
Scott Main
|
4861668e4c
|
am c82875e4: am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'c82875e4c1997f8d6d950a74e1353eb5b2c5ae19':
dashboard update for 8/1
|
2012-08-01 14:48:42 -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
|
be5ac14600
|
Merge "Doc update: C2DM -> GCM."
|
2012-08-01 13:22:37 -07:00 |
|
Peter Ng
|
2b1584c1d5
|
new confirming page and updates to progress and iconography
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
|
2012-08-01 13:16:02 -07:00 |
|
Scott Main
|
c82875e4c1
|
am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'e2594672d279234459aba308c093f444b04c5e91':
dashboard update for 8/1
|
2012-08-01 12:54:29 -07:00 |
|
Scott Main
|
e2594672d2
|
Merge "dashboard update for 8/1" into jb-dev
|
2012-08-01 12:46:40 -07:00 |
|