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

41 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
Scott Main
27c57555db fix misc broken links 
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
 2013-08-01 11:31:38 -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
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
b8525dd712 clean up the results for 'android' in search suggestions 
Change-Id: Ia89dce3b2b911f4eaffbe1a224749cda39f65984
 2013-05-23 15:43:37 -07:00
Joe Fernandez
cb5d59fd35 am 278f6ec3: am 9af9a39d: am 95f6c758: Search tag additions 
* commit '278f6ec3c3611f18a6364df0902a7ff6eb78b690':
  Search tag additions
 2013-05-14 17:57:49 -07:00
Joe Fernandez
95f6c758ae Search tag additions 
Adding more search tags for feature areas (tools, adk, gcm, etc.)

Change-Id: I34b9b6e220b19f6adaf532e39eebb0d30b1573c7
 2013-05-14 16:10:58 -07:00
kmccormick
157155887c am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit 'c9c33d9373d9781dd21e449493e66de127c2d87a':
  Doc update: CCS and notifications
 2013-05-14 11:35:59 -07:00
kmccormick
eeaac812be Doc update: CCS and notifications 
Change-Id: I607441a39b420ef1ebcaeb676a4f97dcd7286fe3
 2013-05-13 19:49:54 -07:00
kmccormick
47cccbd09d am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'f9a152d8fbf012f990afe02a4ef3d528853ca30b':
  Doc update: Fix firewall text.
 2013-04-22 13:16:44 -07:00
kmccormick
ce534905a6 Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 2013-04-22 20:08:11 +00:00
kmccormick
91290d59d5 Doc update: Fix firewall text. 
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
 2013-04-22 12:28:25 -07:00
Scott Main
3b4f85b715 am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions 
* commit 'e397020d4d9144583d4dc05e1ed8ded254b21162':
  search suggest tags for google service docs and exclude a whole bunch from suggestions
 2013-04-19 13:03:04 -07:00
Scott Main
6afeb0e5e7 search suggest tags for google service docs 
and exclude a whole bunch from suggestions

Change-Id: Id79653216fdcdd18e50d2463b0d27c1584848213
 2013-04-16 21:15:36 -07:00
kmccormick
a92ca7fa3e am a8858d21: am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs 
* commit 'a8858d215123b819557d130bfeeeb50568649b51':
  Doc update: clarify guidelines for firewall setup.
 2013-03-29 16:04:05 -07:00
kmccormick
b43fd58a10 Doc update: clarify guidelines for firewall setup. 
Change-Id: Id3284bb21a0a2b612babf6cf582fda8f1c73cb80
 2013-03-29 15:21:12 -07:00
kmccormick
b332bc87b5 am ccc7841d: am 72d4a56d: am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 
* commit 'ccc7841d098dc33a48aa738fc46b13f65ee5281f':
  Doc Update: GCM cleanup
 2013-03-20 15:30:27 -07:00
kmccormick
510f69b310 Doc Update: GCM cleanup 
Bug # 8144337, 8289556, 8289952, 7579225

Change-Id: Ibfc4a703a89572525b75e71ac2b5392c41bd1733
 2013-03-20 14:52:33 -07:00
Scott Main
ec9d259619 am 23becda5: am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console" 
# Via Android Git Automerger (4) and Scott Main (1)
* commit '23becda5d008bfe64a9b101e6967d96d4ece8d0e':
  docs: change "android developer console" to "developer console"
 2013-02-04 13:17:45 -08:00
Scott Main
e55d5e864b docs: change "android developer console" to "developer console" 
Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935
 2013-01-30 15:54:18 -08:00
Scott Kennedy
57b59e025b am aebeea4c: am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit 'aebeea4cf39acae833b1b7f27a4c08d3b55dee37':
  docs: Fix a bunch of issues
 2013-01-14 11:19:13 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Dirk Dougherty
61ccf7151a am 31291e6f: am 3f4e938e: am fda0b508: am c7fe9fd4: Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 
* commit '31291e6fcabacedd5813ea4647730cf254b43f2f':
  Doc change: remove old version of gcm javadoc and misc files.
 2012-12-02 17:51:51 -08:00
Dirk Dougherty
c7fe9fd4e0 Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 2012-12-02 17:43:12 -08:00
Dirk Dougherty
587504a434 Doc change: remove old version of gcm javadoc and misc files. 
Change-Id: Icbc0345e04432af97fb859be8787741b7e979c1b
 2012-12-02 17:33:52 -08:00
Katie McCormick
8655dff53f am 6edcca07: am d50fcc06: am 36166345: am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev 
* commit '6edcca077d69c8b6951c861a1e123995c1a5046a':
  Doc change: updating lib links
 2012-12-02 16:56:59 -08:00
Katie McCormick
f3dda7243c Merge "Doc change: updating lib links" into jb-mr1-dev 2012-12-02 16:48:15 -08:00
Katie McCormick
b755c27fc0 Doc change: updating lib links 
Bug # 7038255

Change-Id: I702aeaed5fcbf7a9cb46b2ccd0e7baff53e48dab
 2012-12-01 11:25:37 -08:00
Scott Main
decf660780 am b294e7f1: am a99ee74c: am 76277df2: am 5f7b668c: misc changes for landing pages 
* commit 'b294e7f17f431b162237b408ef3dc76ddb6b7a94':
  misc changes for landing pages
 2012-11-30 20:17:49 -08:00
Scott Main
5f7b668c96 misc changes for landing pages 
Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6
 2012-11-30 19:32:21 -08:00
Dirk Dougherty
3ce74b24d8 am fa459613: am 6875b438: am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit 'fa4596131d818667e26ffbdba6f351f6c1073ee9':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:21:34 -08:00
Dirk Dougherty
2b286bb26b Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved. 
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
 2012-11-29 21:07:41 -08:00
Robert Ly
1678d8dd13 am 14d58085: am e03a213e: am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit '14d580850d3e97f5428f0a50ee9a09848744a325':
  docs: add new GMS landing and reference
 2012-11-27 18:44:03 -08:00
Robert Ly
6519ca0c5f docs: add new GMS landing and reference 
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
 2012-11-27 16:09:58 -08:00