summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
* am d9bb6bc2: am 08810efc: docs: provide overview of the web apps docs and ↵Scott Main2010-11-0411-69/+163
|\ | | | | | | | | | | | | revise images in the targeting doc * commit 'd9bb6bc283b3f7ee75da14c42c8a563214103c05': docs: provide overview of the web apps docs and revise images in the targeting doc
| * am 08810efc: docs: provide overview of the web apps docs and revise images ↵Scott Main2010-11-0311-69/+163
| |\ | | | | | | | | | | | | | | | | | | in the targeting doc * commit '08810efc1a1868261fb042355f75ab049438b6e3': docs: provide overview of the web apps docs and revise images in the targeting doc
| | * docs: provide overview of the web apps docs and revise images in the ↵Scott Main2010-11-0311-69/+163
| | | | | | | | | | | | | | | | | | targeting doc Change-Id: I7c7c5b1936bea0676a2cafa5020e2b997c0b8634
* | | am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update ↵Dirk Dougherty2010-11-035-483/+1159
|\ \ \ | |/ / | | | | | | | | | | | | | | | uses-feature and permissions docs." into froyo * commit '243a28ba2d58acea96a33cd6c73cb805a653863f': Doc change: Update uses-feature and permissions docs.
| * | am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and ↵Dirk Dougherty2010-11-025-483/+1159
| |\ \ | | |/ | | | | | | | | | | | | | | | permissions docs." into froyo * commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac': Doc change: Update uses-feature and permissions docs.
| | * am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." ↵Dirk Dougherty2010-11-025-483/+1159
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into froyo * commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f': Doc change: Update uses-feature and permissions docs.
| | | * Merge "Doc change: Update uses-feature and permissions docs." into froyoDirk Dougherty2010-11-025-483/+1159
| | | |\
| | | | * Doc change: Update uses-feature and permissions docs.Dirk Dougherty2010-11-025-483/+1159
| | | | | | | | | | | | | | | | | | | | Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
* | | | | am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to ↵Joe Malin2010-11-031-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | tools index page." into gingerbread * commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984': DOC CHANGE: Add entry for monkeyrunner to tools index page.
| * | | | am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index ↵Joe Malin2010-11-021-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | page." into gingerbread * commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d': DOC CHANGE: Add entry for monkeyrunner to tools index page.
| | * | | DOC CHANGE: Add entry for monkeyrunner to tools index page.Joe Malin2010-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a
| * | | | am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a7fda21c8298d8f316564280d702206147207005': DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
| | * | | DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
| | | | | | | | | | | | | | | | | | | | Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
* | | | | Merge "Doc Change: Documentation for MonkeyRunner tool"Joe Malin2010-11-018-63/+2668
|\ \ \ \ \
| * | | | | Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6bf21fe1e406b771c9fe8c36be4ad60b522d088d
* | | | | | am e06bdead: am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274': docs: update dashboard
| * | | | am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9': docs: update dashboard
| | * | | am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83': docs: update dashboard
| | | * | docs: update dashboardScott Main2010-11-011-19/+18
| | | |/ | | | | | | | | | | | | Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
* | | | am ce0f9e4e: am 42679cea: Merge "Fix issue #3152415: Various confusions in ↵Dianne Hackborn2010-11-012-30/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | docs about Application" into gingerbread * commit 'ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba': Fix issue #3152415: Various confusions in docs about Application
| * | | am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about ↵Dianne Hackborn2010-11-012-30/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Application" into gingerbread * commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5': Fix issue #3152415: Various confusions in docs about Application
| | * | Fix issue #3152415: Various confusions in docs about ApplicationDianne Hackborn2010-11-012-30/+18
| | | | | | | | | | | | | | | | Change-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83
* | | | am f2ca96bc: am 38fd3948: am 579db096: docs: remove another "new" tagScott Main2010-10-291-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f2ca96bcc9f5117a79c69edf11026653643419a3': docs: remove another "new" tag
| * | | am 38fd3948: am 579db096: docs: remove another "new" tagScott Main2010-10-291-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '38fd394815a992c8874f73389e8ca849782e5fcd': docs: remove another "new" tag
| | * | am 579db096: docs: remove another "new" tagScott Main2010-10-291-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '579db096fa05bd077fadb04876ecf99e3ccd02b9': docs: remove another "new" tag
| | | * docs: remove another "new" tagScott Main2010-10-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
* | | | am 7ffe802a: am 6e8d6bd0: Merge "docs: Update various SDK docs for GB ↵Scott Main2010-10-293-127/+147
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | platform and tools" into gingerbread * commit '7ffe802a2fd6f339b420172039bf5ea70d821d60': docs: Update various SDK docs for GB platform and tools
| * | | am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and ↵Scott Main2010-10-293-127/+147
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | tools" into gingerbread * commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136': docs: Update various SDK docs for GB platform and tools
| | * | Merge "docs: Update various SDK docs for GB platform and tools" into ↵Scott Main2010-10-293-127/+147
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | docs: Update various SDK docs for GB platform and toolsScott Main2010-10-283-127/+147
| | | | | | | | | | | | | | | | | | | | Change-Id: I8ccb296e5fba57743197bec140e9c79750f0d4f6
* | | | | resolved conflicts for merge of f0b3fa60 to masterScott Main2010-10-253-74/+73
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
| * | | | am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from ↵Scott Main2010-10-253-76/+72
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK and Resources nav items Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp * commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4': update featured videos
| | * | | am c9ac1079: update featured videos also remove "new" tags from SDK and ↵Scott Main2010-10-253-76/+72
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources nav items Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread * commit 'c9ac1079696b93a294f504c6561397ef731a46f9': update featured videos
| | | * | update featured videosScott Main2010-10-253-76/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove "new" tags from SDK and Resources nav items Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
* | | | | am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test ↵Joe Malin2010-10-253-15/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package" into gingerbread Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d' * commit '96bdc500104c3e162495a9bfcf90799467e45c3d': Doc Change: Revert NotePad sample test package
| * | | | am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into ↵Joe Malin2010-10-253-15/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp * commit '5016df1cface59b04ad59d0fef29ea32dcad8d60': Doc Change: Revert NotePad sample test package
| | * | | Doc Change: Revert NotePad sample test packageJoe Malin2010-10-253-15/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
* | | | | am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc ↵Scott Main2010-10-211-4/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all ↵Scott Main2010-10-191-4/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | am a6df4b1b: docs: add note to froyo platform doc that not all locales are ↵Scott Main2010-10-191-4/+9
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | | | | | | | | | | | | | | | | 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
| | | * docs: add note to froyo platform doc that not all locales are included in ↵Scott Main2010-10-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | the sdk image Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
* | | | am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev ↵Scott Main2010-10-171-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide link in package description" into froyo Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d' * commit '81df9841c64e417fe2adfab0e8d694af09e07c0d': docs: fix typo; surface dev guide link in package description
| * | | am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in ↵Scott Main2010-10-151-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | package description" into froyo Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp * commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b': docs: fix typo; surface dev guide link in package description
| | * | am fda5b19c: Merge "docs: fix typo; surface dev guide link in package ↵Scott Main2010-10-151-3/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | description" into froyo Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread * commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c': docs: fix typo; surface dev guide link in package description
| | | * Merge "docs: fix typo; surface dev guide link in package description" into froyoScott Main2010-10-151-3/+3
| | | |\
| | | | * docs: fix typo; surface dev guide link in package descriptionScott Main2010-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
* | | | | am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-171-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800' * commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800': docs: fix code snippet errors
| * | | | am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp * commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb': docs: fix code snippet errors
| | * | | am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread * commit '09da96099917141f2b90d53f61baa822bdd434d7': docs: fix code snippet errors
| | | * | docs: fix code snippet errorsScott Main2010-10-151-4/+4
| | | |/ | | | | | | | | | | | | Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9