drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,220 Commits 1 Branch 0 Tags
Commit Graph

258 Commits

Author SHA1 Message Date
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 10:57:31 -07:00
Scott Main
6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." 
Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
 2013-08-12 17:40:37 +00:00
Scott Main
ebcee19783 Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" 
revert to fix conflicts, i'll fix it all later.

This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.

Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
 2013-08-12 17:08:28 +00:00
Scott Main
b478b10f34 Revert "Doc change: collapse key fix." 
To resolve conflict. I'll fix it all later.

This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
 2013-08-12 09:57:24 -07:00
Katie McCormick
385bb2eb51 resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev 
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
 2013-08-09 17:55:05 -07:00
Katie McCormick
53d9628d08 Doc change: collapse key fix. 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-09 15:32:23 -07:00
Dirk Dougherty
f518398e4c Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs 2013-08-01 21:41:30 +00:00
Scott Main
27c57555db fix misc broken links 
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
 2013-08-01 11:31:38 -07:00
Katie McCormick
b1952e4f47 Doc Update: Delete this unpublished cruft. 
Change-Id: I8ab8a4ddea64a2b0916c4c7d18cd56fe14856bda
(cherry picked from commit d3d242e268ad4517d7ff20c1f221b1d4d7d3347f)
 2013-08-01 18:10:46 +00:00
Dirk Dougherty
a9dcc33459 Doc change: edits to purchase status api docs. 
Change-Id: I96e8c9d47e90fe2bc9d3dd449524686a094c7041
(cherry picked from commit cd9a1a8fe98bd29e3f52b8a04e8106e89b431d64)
 2013-07-31 00:49:43 +00:00
Scott Main
299c5ea31b Revert "docs: add link to developer survey on main landing pages" 
This reverts commit da31f2ea9274614da18aa2544fc43fb4ee213741.
 2013-07-30 12:28:43 -07:00
Dirk Dougherty
d9065a5cc0 Doc change: fix typo. 
Change-Id: I2f955a0c20ccf9012d910b07b351c627263b7aa0
 2013-07-28 14:02:01 -07:00
Scott Main
4e2c9dc74b update all links to the support library 
Change-Id: I173e3690148e5de3020bfdca8087906faa56b13b
 2013-07-23 19:37:52 -07:00
Scott Main
29282f9925 am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3':
  update url for backup service key bug: 8834302
 2013-07-09 10:54:18 -07:00
Dirk Dougherty
0f97f3510b am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:54:13 -07:00
Scott Main
b1b693eec6 am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
  update url for backup service key bug: 8834302
 2013-07-09 10:52:44 -07:00
Dirk Dougherty
cfb8f9a076 am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:52:40 -07:00
Scott Main
7cf27aa8e3 Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 2013-07-09 17:50:44 +00:00
Scott Main
bd8dbf0d48 update url for backup service key 
bug: 8834302

Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
 2013-07-09 10:49:20 -07:00
Scott Main
da31f2ea92 docs: add link to developer survey on main landing pages 
Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76
 2013-07-08 16:16:21 -07:00
Dirk Dougherty
9579353081 am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:43:07 -07:00
Dirk Dougherty
2b336ce4d8 am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:40:06 -07:00
Dirk Dougherty
3574bef462 am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:35:17 -07:00
Dirk Dougherty
57bb89f0b2 Doc change: Add docs for GP Purchase Status API. 
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
 2013-06-12 16:06:36 -07:00
kmccormick
38bdf107ba am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '57394e3daff094c28ee2a2fb886e1764a1b7728d':
  Doc update: Refactoring to client/server.
 2013-06-05 18:32:23 -07:00
kmccormick
57394e3daf am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '2fbe109466ba582663fdc0f98ff4b9aeeb15ce32':
  Doc update: Refactoring to client/server.
 2013-06-05 18:30:19 -07:00
kmccormick
3ef445a80a am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '68291f33e03be5180dc5c921d71cafbc83507301':
  Doc update: Refactoring to client/server.
 2013-06-05 18:26:16 -07:00
kmccormick
f788ac1ab1 Doc update: Refactoring to client/server. 
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
 2013-06-05 18:01:06 -07:00
Scott Main
ccec9de2c5 am 40f8668a: am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit '40f8668a5f3bde3b89225a047775ccca30d33c40':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:22:01 -07:00
Scott Main
40f8668a5f am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev 
* commit 'ca725a1a7d080a13071170ab28064d116bc7e901':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:19:28 -07:00
Scott Main
92ff58628b Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev 2013-05-29 22:11:24 +00:00
Scott Main
597a837449 am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:59:09 -07:00
Scott Main
afaff6e2e9 am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:57:27 -07:00
Scott Main
85dd5ec6c0 update GPS setup page to include emulator support. 
revise the doc layout with headings

Change-Id: If063782474e4187779dbc1fd23743fa87a69d316
 2013-05-24 11:02:55 -07:00
Scott Main
b8525dd712 clean up the results for 'android' in search suggestions 
Change-Id: Ia89dce3b2b911f4eaffbe1a224749cda39f65984
 2013-05-23 15:43:37 -07:00
kmccormick
5482b65ae8 am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
  Doc update: fix GCM TOC
 2013-05-23 10:56:56 -07:00
kmccormick
88f24e6fe8 am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
  Doc update: fix GCM TOC
 2013-05-23 10:54:10 -07:00
kmccormick
e56e2483c5 am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
  Doc update: fix GCM TOC
 2013-05-23 10:49:58 -07:00
kmccormick
c6c149aa14 Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 2013-05-23 17:45:26 +00:00
kmccormick
cd7e9ebbba Doc update: fix GCM TOC 
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
 2013-05-22 18:25:21 -07:00
Dirk Dougherty
d258b1efe7 am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '2d31a8e85ca9e10c1dca720e89f2caa15dfd6e45':
  Doc change: fix doc title.
 2013-05-21 10:21:34 -07:00
Dirk Dougherty
2d31a8e85c am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit 'a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
  Doc change: fix doc title.
 2013-05-21 10:19:39 -07:00
Dirk Dougherty
0269b3dde0 am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
  Doc change: fix doc title.
 2013-05-21 10:12:55 -07:00
Dirk Dougherty
a963459e3f Merge "Doc change: fix doc title." into jb-mr1.1-docs 2013-05-21 17:05:08 +00:00
Dirk Dougherty
07340d636d Doc change: fix doc title. 
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
 2013-05-21 10:03:35 -07:00
Dirk Dougherty
7b2fba2f4a am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge 
* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
  Doc change: updates to location landing.
 2013-05-15 07:37:55 -07:00
Dirk Dougherty
997d00428c am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge 
* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.
 2013-05-15 07:35:49 -07:00
Dirk Dougherty
231e2474f2 Merge commit 'c3069c26' into manualmerge 
Conflicts:
	docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
 2013-05-15 07:30:11 -07:00
Dirk Dougherty
d14295cf0e Doc change: updates to location landing. 
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
 2013-05-15 06:31:48 -07:00
Scott Main
dab92bca84 am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging 
* commit '78d38908c43f2af43347cb19d4712617041ea815':
  more search suggest tagging
 2013-05-15 02:43:33 -07:00