1. 1a469ca Resolved conflicts for merge of 2bd6afed to master by Jason Chen · 14 years ago
  2. 2bd6afe am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo by Fred Chung · 14 years ago
  3. b50d5ed am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo by Fred Chung · 14 years ago
  4. 30264c9 Merge "Doc change: Adding new docs for Device Admin API." into froyo by Fred Chung · 14 years ago
  5. 996acec am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement by Scott Main · 14 years ago
  6. 5302798 Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." by Scott Main · 14 years ago
  7. 537b222 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 by Scott Main · 14 years ago
  8. f6fe78b docs: Rewrite of App Fundamentals.. Part 1. by Scott Main · 14 years ago
  9. d9ec8eb resolved conflicts for merge of 7008b7c1 to master by Scott Main · 14 years ago
  10. 262b431 Doc change: Adding new docs for Device Admin API. by Katie McCormick · 14 years ago
  11. 196894c am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement by Scott Main · 14 years ago
  12. c692792 am 46ffeb21: docs: update homepage with more countries for market announcement by Scott Main · 14 years ago
  13. fc7f391 am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 by Scott Main · 14 years ago
  14. 46ffeb2 docs: update homepage with more countries for market announcement by Scott Main · 14 years ago
  15. b3a5b85 am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 by Scott Main · 14 years ago
  16. 7008b7c am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide by Scott Main · 14 years ago
  17. ae1864c am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide by Scott Main · 14 years ago
  18. 6ef33cb3 docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 by Scott Main · 14 years ago
  19. ec80d7f docs: consistency fixit for the quickview boxes in the dev guide by Scott Main · 14 years ago
  20. 934f042 am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. by Dirk Dougherty · 14 years ago
  21. 44fad94 am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. by Dirk Dougherty · 14 years ago
  22. 30f5729 am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. by Dirk Dougherty · 14 years ago
  23. ba944cc Doc change: update screens support table and remove outdated density/size metrics. by Dirk Dougherty · 14 years ago
  24. 7091f66 am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 by Scott Main · 14 years ago
  25. de5e6af am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 by Scott Main · 14 years ago
  26. 91b0bc2 am 32441bbe: docs: device dashboard update for 10/1 by Scott Main · 14 years ago
  27. 32441bb docs: device dashboard update for 10/1 by Scott Main · 14 years ago
  28. d4f1436 am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. by Chris Palmer · 14 years ago
  29. 143e610 DO NOT MERGE Clarify the explanation of Android's security design. by Chris Palmer · 14 years ago
  30. 797256f5 Merge "Clarify the explanation of Android's security design." by Chris Palmer · 14 years ago
  31. 8daac14 Clarify the explanation of Android's security design. by Chris Palmer · 14 years ago
  32. 297bb68 Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." by Bill Napier · 14 years ago
  33. 8cb9e9c am 85662b8e: am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread by Dirk Dougherty · 14 years ago
  34. 85662b8 am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread by Dirk Dougherty · 14 years ago
  35. f356c4b Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread by Dirk Dougherty · 14 years ago
  36. 35a840c am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo by Scott Main · 14 years ago
  37. 9a97aaf Doc change: ADT 0.9.9 version notes, size/sum update. by Dirk Dougherty · 14 years ago
  38. a242779 am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo by Scott Main · 14 years ago
  39. 2dc43f3 am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo by Scott Main · 14 years ago
  40. 5b7328f Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo by Scott Main · 14 years ago
  41. 27de3a2 Doc change: ADT 0.9.9 version notes, size/sum update. by Dirk Dougherty · 14 years ago
  42. 6ec3d4f docs: add more info about state list drawable and onclick attribute to Button by Scott Main · 14 years ago
  43. 0b7a3bc Merge "Doc Change: add screenshots to Testing in Eclipse topic" by Joe Malin · 14 years ago
  44. 9316232 Fix broken javadoc. by Joe Onorato · 14 years ago
  45. 40da25a am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread by Dirk Dougherty · 14 years ago
  46. 04065bd am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread by Joe Onorato · 14 years ago
  47. 8ee9ecc am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread by Dirk Dougherty · 14 years ago
  48. 9afd909 Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread by Dirk Dougherty · 14 years ago
  49. 9519eab Doc change: clean up droiddoc (cs) macros. by Dirk Dougherty · 14 years ago
  50. ee76ed9 am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread by Joe Onorato · 14 years ago
  51. d3ad696 Fix the rest of the javadoc warnings. by Joe Onorato · 14 years ago
  52. d20e5d0 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. by Joe Onorato · 14 years ago
  53. f8a93cb am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread by Joe Onorato · 14 years ago
  54. 71f7f67 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. by Joe Onorato · 14 years ago
  55. 8b0b7af Fix up some issues with the onCreateContextMenu example in the Notepad tutorial. by Bill Napier · 14 years ago
  56. f6a04aee am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. by Dirk Dougherty · 14 years ago
  57. f9c7a3e am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. by Dirk Dougherty · 14 years ago
  58. e71396c am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. by Dirk Dougherty · 14 years ago
  59. 4b4af99 Doc change: update ADT 0.9.8 checksum and size. by Dirk Dougherty · 14 years ago
  60. 8ca8ff1 am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard by Scott Main · 14 years ago
  61. 2c1723e Doc Change: add screenshots to Testing in Eclipse topic by Joe Malin · 14 years ago
  62. 4cf0f45 am 3b202844: am 51c18989: docs: update platform dashboard by Scott Main · 14 years ago
  63. 3b20284 am 51c18989: docs: update platform dashboard by Scott Main · 14 years ago
  64. 51c1898 docs: update platform dashboard by Scott Main · 14 years ago
  65. 6245480 am 621c6adc: am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. by Dirk Dougherty · 14 years ago
  66. 621c6ad am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. by Dirk Dougherty · 14 years ago
  67. a71d699 am 74a74d3c: Doc change: Fixes for toggle image and adt release date. by Dirk Dougherty · 14 years ago
  68. 74a74d3 Doc change: Fixes for toggle image and adt release date. by Dirk Dougherty · 14 years ago
  69. a78eca9 Merge "Progress Dialog documentation example uses onPrepareDialog" by Gilles Debunne · 14 years ago
  70. 6e1df0e Progress Dialog documentation example uses onPrepareDialog by Gilles Debunne · 14 years ago
  71. 54ceb6e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo by Dirk Dougherty · 14 years ago
  72. eed5d17 am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo by Dirk Dougherty · 14 years ago
  73. ea68cab am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo by Dirk Dougherty · 14 years ago
  74. 3eb07ea Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo by Dirk Dougherty · 14 years ago
  75. 022171b Doc change: Add notes for SDK Tools r7 and ADT 0.9.8. by Dirk Dougherty · 14 years ago
  76. da2d18a am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread by Elliott Hughes · 14 years ago
  77. c50a4f3 am 45cda90b: Merge "Be brief." into gingerbread by Elliott Hughes · 14 years ago
  78. 45cda90 Merge "Be brief." into gingerbread by Elliott Hughes · 14 years ago
  79. 8ae409f am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error by Scott Main · 14 years ago
  80. bfbf84b am 2b136832: am c4367e54: fix code snippet error by Scott Main · 14 years ago
  81. 2b136832 am c4367e54: fix code snippet error by Scott Main · 14 years ago
  82. c4367e5 fix code snippet error by Scott Main · 14 years ago
  83. b433298 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo by Scott Main · 14 years ago
  84. beccf3c am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo by Scott Main · 14 years ago
  85. 3208557 am c5083cdf: Merge "clarify dp dimension description" into froyo by Scott Main · 14 years ago
  86. c5083cd Merge "clarify dp dimension description" into froyo by Scott Main · 14 years ago
  87. 3e3fcf9 Testing Documentation in the Dev Guide tab by Joe Malin · 14 years ago
  88. 4dcea37 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. by Brad Fitzpatrick · 14 years ago
  89. e339c09 am 9020595b: am f5287094: Fix closing tag in docs. by Brad Fitzpatrick · 14 years ago
  90. 9020595 am f5287094: Fix closing tag in docs. by Brad Fitzpatrick · 14 years ago
  91. f528709 Fix closing tag in docs. by Brad Fitzpatrick · 14 years ago
  92. aea2d76 Fix in fundamentals web page. by Gilles Debunne · 14 years ago
  93. edb6566 Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12" by Joe Malin · 14 years ago
  94. 91047d3 am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo by Dirk Dougherty · 14 years ago
  95. 9ac16d2 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo by Scott Main · 14 years ago
  96. 976b71e am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo by Dirk Dougherty · 14 years ago
  97. afdc85f am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo by Dirk Dougherty · 14 years ago
  98. 397c0f5 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo by Dirk Dougherty · 14 years ago
  99. 1ba6288 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes. by Dirk Dougherty · 14 years ago
  100. 32b07fc am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo by Scott Main · 14 years ago