Scott Main
5c95212f6a
am f2ca96bc: am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit 'f2ca96bcc9f5117a79c69edf11026653643419a3':
docs: remove another "new" tag
2010-10-29 17:23:24 -07:00
Scott Main
f2ca96bcc9
am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit '38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
2010-10-29 17:21:07 -07:00
Scott Main
38fd394815
am 579db096: docs: remove another "new" tag
...
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
2010-10-29 17:16:57 -07:00
Scott Main
579db096fa
docs: remove another "new" tag
...
Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
2010-10-29 17:12:37 -07:00
Scott Main
723aa7088f
am 7ffe802a: am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '7ffe802a2fd6f339b420172039bf5ea70d821d60':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:39:56 -07:00
Scott Main
7ffe802a2f
am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:37:17 -07:00
Scott Main
6e8d6bd09f
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
2010-10-29 15:34:00 -07:00
Scott Main
06cf15e696
docs: Update various SDK docs for GB platform and tools
...
Change-Id: I8ccb296e5fba57743197bec140e9c79750f0d4f6
2010-10-28 23:28:28 -07:00
Scott Main
024127c11f
resolved conflicts for merge of f0b3fa60 to master
...
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
2010-10-25 17:54:33 -07:00
Scott Main
f0b3fa60db
am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
...
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp
* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
update featured videos
2010-10-25 17:23:10 -07:00
Scott Main
3d40cd5055
am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
...
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread
* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
update featured videos
2010-10-25 17:15:50 -07:00
Joe Malin
39f3e380fe
am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
...
Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d'
* commit '96bdc500104c3e162495a9bfcf90799467e45c3d':
Doc Change: Revert NotePad sample test package
2010-10-25 16:27:15 -07:00
Joe Malin
96bdc50010
am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
...
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
2010-10-25 16:22:46 -07:00
Joe Malin
24fed74a34
Doc Change: Revert NotePad sample test package
...
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
2010-10-25 15:55:13 -07:00
Scott Main
c9ac107969
update featured videos
...
also remove "new" tags from SDK and Resources nav items
Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
2010-10-25 15:42:03 -07:00
Scott Main
9c09ebd2b4
am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
...
Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df'
* commit 'b619e3332d36a8b5c56da6530834be8cc69272df':
docs: add note to froyo platform doc that not all locales are included in the sdk image
2010-10-21 09:56:04 -07:00
Scott Main
b619e3332d
am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
...
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp
* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
docs: add note to froyo platform doc that not all locales are included in the sdk image
2010-10-19 17:43:37 -07:00
Scott Main
218bf88446
am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
...
Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread
* commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
docs: add note to froyo platform doc that not all locales are included in the sdk image
2010-10-19 17:29:29 -07:00
Scott Main
a6df4b1bfd
docs: add note to froyo platform doc that not all locales are included in the sdk image
...
Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
2010-10-19 16:40:14 -07:00
Scott Main
dbb78f0e4e
am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d'
* commit '81df9841c64e417fe2adfab0e8d694af09e07c0d':
docs: fix typo; surface dev guide link in package description
2010-10-17 13:49:45 -07:00
Scott Main
2d8933879c
am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errors
...
Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800'
* commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800':
docs: fix code snippet errors
2010-10-17 13:49:35 -07:00
Nick Kralevich
5ac4fe5113
am 6bc34da8: am 612ebb92: Revert "Update the documentation for content provider security."
...
Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d'
* commit '6bc34da8acf26c8e70325719fe43eaf22489809d':
Revert "Update the documentation for content provider security."
2010-10-16 09:43:23 -07:00
Nick Kralevich
8bc68360b6
am 86052a87: am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
...
Merge commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8'
* commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8':
Update the documentation for content provider security.
2010-10-16 09:14:21 -07:00
Scott Main
81df9841c6
am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Scott Main
b2bd470010
am 7f3addf3: am 09da9609: docs: fix code snippet errors
...
Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp
* commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb':
docs: fix code snippet errors
2010-10-15 18:23:26 -07:00
Joe Malin
a79935afd0
am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
...
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'
* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
DOC CHANGE: Fix bug in Testing doc
2010-10-15 14:26:57 -07:00
Scott Main
2c1dab4483
am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Scott Main
7f3addf37f
am 09da9609: docs: fix code snippet errors
...
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread
* commit '09da96099917141f2b90d53f61baa822bdd434d7':
docs: fix code snippet errors
2010-10-15 12:34:50 -07:00
Scott Main
fda5b19c75
Merge "docs: fix typo; surface dev guide link in package description" into froyo
2010-10-15 10:46:33 -07:00
Scott Main
09da960999
docs: fix code snippet errors
...
Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
2010-10-15 10:40:54 -07:00
Scott Main
36cdecd89d
docs: fix typo; surface dev guide link in package description
...
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
2010-10-15 10:19:27 -07:00
Nick Kralevich
6bc34da8ac
am 612ebb92: Revert "Update the documentation for content provider security."
...
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp
* commit '612ebb9257e2adf982ed846fa43251c3754361f7':
Revert "Update the documentation for content provider security."
2010-10-15 10:11:50 -07:00
Nick Kralevich
612ebb9257
Revert "Update the documentation for content provider security."
...
This reverts commit 4fe4d4c91cdfa59bb8161625be85252e187667a2.
2010-10-15 10:05:29 -07:00
Nick Kralevich
86052a8740
am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
...
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp
* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
Update the documentation for content provider security.
2010-10-15 09:24:39 -07:00
Nick Kralevich
66f1c459ac
Merge "Update the documentation for content provider security." into gingerbread
2010-10-15 09:17:12 -07:00
Scott Main
a8d2506573
am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'
* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-15 00:07:26 -07:00
Joe Malin
439444d904
am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
...
Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp
* commit '75d3591b2dd60e50182542045147b9b6033c2b85':
DOC CHANGE: Fix bug in Testing doc
2010-10-14 12:09:33 -07:00
Joe Malin
75d3591b2d
Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
2010-10-14 12:05:33 -07:00
Dirk Dougherty
068e695676
Doc change: Merge commit 'd555e264' into manualmerge
...
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
2010-10-13 19:32:02 -07:00
Brad Fitzpatrick
bbf68c6ad2
am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
...
Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc'
* commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc':
StrictMode: link to designing for responsiveness ANR docs
2010-10-13 17:03:10 -07:00
Scott Main
5cfa877e22
am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp
* commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:27:08 -07:00
Scott Main
eb4ef07223
am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread
* commit '5249ad03454301744374d04e04b38aaad3b01530':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:08:02 -07:00
Scott Main
5249ad0345
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
...
bug: 3088494
Change-Id: I9da318efb3d05d52eb8c2677e96da1bcf1cd542a
2010-10-12 17:10:31 -07:00
Joe Malin
9c61f8fc01
DOC CHANGE: Fix bug in Testing doc
...
Change-Id: Id432a40adfb6aef05a3e7c19425de54cb8a5f610
2010-10-12 14:36:59 -07:00
Dirk Dougherty
d555e2643f
am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
...
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
2010-10-12 14:18:33 -07:00
Dirk Dougherty
354954a01c
Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
2010-10-12 14:16:05 -07:00
Chris Palmer
4fe4d4c91c
Update the documentation for content provider security.
...
Without this documentation fix, developers will not know that
apps on pre-Gingercomb devices will inadvertantly export their content
providers. With knowledge of the solid workaround, they can make their apps
secure.
Change-Id: I1f096aff19500cd3d3fd2955a9dec59d8e7c6a73
2010-10-12 13:28:11 -07:00
Brad Fitzpatrick
4711d21a55
am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
...
Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp
* commit '9facd2d0847691ae46108713d6a7dc9f51a62135':
StrictMode: link to designing for responsiveness ANR docs
2010-10-12 08:23:40 -07:00
Scott Main
3fd40ee692
Revert "docs: new web apps dev guides" Do not merge.
...
This reverts commit 65e62f4f908394fc469cf535fef7c16035a428a2.
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: If6eb679a629bd4376043b2f49b6a82eacf71603d
2010-10-11 14:27:30 -07:00
Brad Fitzpatrick
9fc2fc5757
StrictMode: link to designing for responsiveness ANR docs
...
Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
2010-10-11 13:17:48 -07:00