1559 Commits

Author SHA1 Message Date
Scott Main
3b3d16ab88 am 67501e77: am ffd20dac: Merge "docs: udpate action bar dev guide" into honeycomb
* commit '67501e77ad2ce2b46259758a6f03e6b768980fc4':
  docs: udpate action bar dev guide
2011-02-02 18:10:45 -08:00
Scott Main
67501e77ad am ffd20dac: Merge "docs: udpate action bar dev guide" into honeycomb
* commit 'ffd20dac9b616ff1c31c4c7b46dd86b05a82ed30':
  docs: udpate action bar dev guide
2011-02-02 18:08:23 -08:00
Scott Main
ffd20dac9b Merge "docs: udpate action bar dev guide" into honeycomb 2011-02-02 18:06:01 -08:00
Scott Main
4d8a596665 am 8007af91: am 603b475e: am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '8007af91ed229936dee24f3b8b7f76abd5598502':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:46:42 -08:00
Scott Main
8007af91ed am 603b475e: am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '603b475e59d0ebcdb9bac297fc91e80cafbdb3a9':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:44:13 -08:00
Scott Main
603b475e59 am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '4add7f3ffcebe1564d1e492194817afaf107ac16':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:41:29 -08:00
Scott Main
4add7f3ffc cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
update OEM driver list with new fujitsu and kyocera

Change-Id: Ice11a179fe6a4eb220509fc784ac6f6af5a2fa5e
2011-02-02 16:32:11 -08:00
Bill Gruber
510e0af108 am a9b9e3f7: am 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'a9b9e3f7a955888c44ecfba6cf29c420862976d2':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 16:25:26 -08:00
Scott Main
7afca39e84 am 44ebca2a: am cb2d8817: am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '44ebca2a3d994630e6d500725d86aab391d1d879':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 16:25:23 -08:00
Scott Main
8f2f30ccbb am 062f2c4e: am 8b05f6a2: am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '062f2c4e22b2d38d9d8983beb14d7363607177ff':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 16:22:12 -08:00
Bill Gruber
a9b9e3f7a9 am 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit '930189f0f7c302dc76031d88f7a90f32bb57e7b6':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 16:18:18 -08:00
Scott Main
44ebca2a3d am cb2d8817: am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit 'cb2d88176565a199ad6c6a3a6360a166bd700579':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 16:18:11 -08:00
Scott Main
062f2c4e22 am 8b05f6a2: am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '8b05f6a2af3b12fd92991feb4a32a9a252d7d7c6':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 16:10:29 -08:00
Robert Ly
d3f802c02f resolved conflicts for merge of c0b3ba83 to master
Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99
2011-02-02 16:08:23 -08:00
Bill Gruber
930189f0f7 am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'df71cabbc2f670a4acea91e04f54990a472a56e9':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 15:46:52 -08:00
Scott Main
cb2d881765 am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 15:44:29 -08:00
Bill Gruber
df71cabbc2 cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs

Change-Id: I26adb5480e556d8f914a3443f1b75c220742245d
2011-02-02 15:42:36 -08:00
Scott Main
2458f2a1cc cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
add notice about large screen devices and the "mobile" string in user agent

Change-Id: I2e6a3f2c4fced2cf06bb996c1135c042682cdf8f
2011-02-02 15:40:47 -08:00
Scott Main
8b05f6a2af am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '0c1a4d3b51337784583ef39378ca8796bb8b0992':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 15:16:13 -08:00
Scott Main
0c1a4d3b51 cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
fix market link on homepage

Change-Id: I1d617c9737e6a3293372bbe70aff0cfa88dfba8c
2011-02-02 15:12:15 -08:00
Robert Ly
c0b3ba83b2 resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp
Change-Id: I407df4448a126a39128f3e24232c166be2625e14
2011-02-02 14:04:20 -08:00
Robert Ly
5347a4b3e5 Doc change: fixing broken links/images
Change-Id: I2e0fd99ec4badc234b88482d0c90b03d33fbdc30
2011-02-02 11:54:28 -08:00
Scott Main
6ea0d2c045 docs: udpate action bar dev guide
Change-Id: Iba3144d489d1468d946cedec4d1d7a3c365be482
2011-02-01 23:07:52 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Dirk Dougherty
51a6df010d am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 11:16:13 -08:00
Scott Main
f067fbfe0c am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 10:40:01 -08:00
Dirk Dougherty
50d7d52810 am 591a5f86: Doc change: fix adt archive filename.
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.
2011-01-29 10:16:14 -08:00
Scott Main
4feebc2c7d am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-29 09:59:33 -08:00
Dirk Dougherty
7588fc0609 am 51bae7e7: am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '51bae7e74aa63b2ff455631c5b7954cfa1927b2f':
  Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 09:00:41 -08:00
Dirk Dougherty
51bae7e74a am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
  Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 08:57:25 -08:00
Scott Main
6857be3a2d am 213705e3: am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '213705e37be670552ff30892b2e60f7b8d279a7e':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 08:02:26 -08:00
Scott Main
213705e37b am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '51330184feb1b8d01ac48f4f13e4b91e7e334401':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 07:59:28 -08:00
Dirk Dougherty
30a85ec7e8 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
2011-01-28 12:00:51 -08:00
Dirk Dougherty
fa809dba8e Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Dirk Dougherty
85dacef709 Doc change: Add time-lapse video to 3.0 highlights.
Change-Id: I5fb9cb76a544a502cd2f67bc1902b2c02a2a52a8
2011-01-27 17:55:35 -08:00
Scott Main
51330184fe am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-27 13:29:13 -08:00
Scott Main
f9af3015ef cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d
revise info about emulator snapshots to indicate it's not final

Change-Id: Ica1584fce9d55deb224937e16696127718e501da
2011-01-27 11:54:30 -08:00
Dirk Dougherty
70085101b2 am 1aa79d4b: am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
* commit '1aa79d4b5c2f12aa3a9ddabbdd679cd3f21a1476':
  Doc change: fix adt archive filename.
2011-01-27 10:13:18 -08:00
Dirk Dougherty
1aa79d4b5c am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
* commit 'd1ca9aa561337dd294b8ae137f54b182372e69fb':
  Doc change: fix adt archive filename.
2011-01-27 10:10:49 -08:00
Dirk Dougherty
d1ca9aa561 am 591a5f86: Doc change: fix adt archive filename.
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.
2011-01-27 10:08:09 -08:00
Dirk Dougherty
591a5f86bd Doc change: fix adt archive filename.
Change-Id: I1cf33678e52b4e85dca472763bfe53b7ecfcfb8b
2011-01-27 10:00:48 -08:00
Scott Main
3205206b81 am 711788bb: am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '711788bb81cfb8b62e9bd7284f01a1d2b55fac8d':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 19:10:38 -08:00
Scott Main
711788bb81 am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit 'bedd242768f7594d12bde0b4c4e7d153c27858d4':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:58:54 -08:00
Scott Main
bedd242768 am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:56:26 -08:00
Scott Main
9e6c0686be catchup the gingerbread branch to gingerbread-docs for all sdk docs
This is just a manual copy of all files that changed, rather than a dozen cherry picks.

Change-Id: I672f74a2ec9242a1d96713d1d84bfc4d2d47dd85
2011-01-26 17:42:49 -08:00
Scott Main
aea82125bd am 108841ff: am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb
* commit '108841ff943a592702698ca17ccfe7d2ce2798ed':
  docs: revise and amend platform notes for preview
2011-01-25 16:19:09 -08:00
Scott Main
108841ff94 am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb
* commit '31e5c30f0240fce5d39abfcbd25cf715b00ec019':
  docs: revise and amend platform notes for preview
2011-01-25 14:48:19 -08:00
Scott Main
7afdaf0b9c docs: revise and amend platform notes for preview
Change-Id: Ief10e85ae7c1a9c56381342e0f3b880ebe57d8ca
2011-01-25 14:09:11 -08:00
Dianne Hackborn
d78da53334 am 21e7ba24: am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
* commit '21e7ba2451fdbc3e69468222638d5ee99eb44c30':
  Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-24 13:36:33 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-24 13:23:43 -08:00