Commit graph

4338 commits

Author SHA1 Message Date
Scott Main
9b6614d58b am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit 'e02449dc9f02459d077c99a72033c7653be634bb':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-05-27 10:54:50 -07:00
Scott Main
e02449dc9f am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '44c32b95f50f1190955a07dfece801875894d0bf':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-05-27 10:23:09 -07:00
Scott Main
44c32b95f5 Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2 2011-05-27 10:18:14 -07:00
Scott Main
17e47ad58f docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08

Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14
2011-05-27 10:15:59 -07:00
Ying Wang
bb567df00a am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '4cd9e2d99090502ced431b7abbff94bcc2176745':
  Support to run dex-preopt on prebuilt apks.
2011-05-26 16:31:42 -07:00
Ying Wang
4cd9e2d990 am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
  Support to run dex-preopt on prebuilt apks.
2011-05-26 16:14:32 -07:00
Ying Wang
06e2f72bc9 Support to run dex-preopt on prebuilt apks.
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
2011-05-26 16:01:57 -07:00
Jean-Baptiste Queru
cdef404572 Merge 5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Jean-Baptiste Queru
5d66a07d44 Merge "Use actual numbers in version numbers." 2011-05-19 13:57:00 -07:00
Scott Main
c9395fc341 am 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '8d29d2dc670cc990fa6824fdd7ba25edb2a479f2':
  docs: make featured video titles smaller so they don't line wrap
2011-05-16 12:22:27 -07:00
Scott Main
8d29d2dc67 am 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '9d27a153f714a312f844a35a0140e3fb1752f4e8':
  docs: make featured video titles smaller so they don't line wrap
2011-05-16 12:19:13 -07:00
Scott Main
9d27a153f7 am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit 'faf8baaff126aec214608acb9107c20066e0cb00':
  docs: make featured video titles smaller so they don't line wrap
2011-05-16 12:17:20 -07:00
Scott Main
faf8baaff1 docs: make featured video titles smaller so they don't line wrap
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
2011-05-16 12:14:17 -07:00
Jean-Baptiste Queru
bdb72318e4 am 5372220a: Merge "Remove simulator from the lunch menu"
* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu
2011-05-12 08:52:59 -07:00
Jean-Baptiste Queru
5372220a1a Merge "Remove simulator from the lunch menu" 2011-05-12 08:04:50 -07:00
Dianne Hackborn
477e963276 am ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit 'ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a':
  DO NOT MERGE.  We are now dev branch for Honeycomb MR2.
2011-05-11 13:49:50 -07:00
Dianne Hackborn
ea4d9f557b am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '22b5d62172f1563a2513dea314c037703cddf217':
  DO NOT MERGE.  We are now dev branch for Honeycomb MR2.
2011-05-11 13:35:36 -07:00
Jean-Baptiste Queru
b27cd8f802 Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
2011-05-11 10:40:43 -07:00
Jean-Baptiste Queru
174c15d067 Use actual numbers in version numbers.
This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.

Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
2011-05-10 08:29:49 -07:00
Dianne Hackborn
22b5d62172 DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
2011-05-09 18:21:14 -07:00
David Turner
57a477ff2e am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit '6f9b7562e36483a7bf23833d99da6a50e57f7266':
  x86: Disable stack-protector until bionic is fixed
2011-04-26 10:24:24 -07:00
David 'Digit' Turner
6e7926a6cd am 55a461c9: am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit '55a461c9b1ab92bf6250650afcacc8de85c1e01a':
  full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 10:24:22 -07:00
David Turner
6f9b7562e3 am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
  x86: Disable stack-protector until bionic is fixed
2011-04-26 01:12:03 -07:00
David 'Digit' Turner
55a461c9b1 am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit 'f245dd7975abedcb35e30aca1b1e6e3eb273388d':
  full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 00:36:59 -07:00
David Turner
d556594243 Merge "x86: Disable stack-protector until bionic is fixed" 2011-04-25 23:35:09 -07:00
David 'Digit' Turner
f245dd7975 Merge "full_x86-eng: Ensure we copy the PC bios files." 2011-04-25 23:25:38 -07:00
Raphael Moll
009e602275 am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 17:28:36 -07:00
Raphael
5e3ce3972c resolved conflicts for merge of 854354be to honeycomb-plus-aosp
Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
2011-04-15 17:13:44 -07:00
Raphael Moll
cb6a22f591 am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 14:56:41 -07:00
Raphael Moll
854354be69 am 531c0c33: Merge "Add swtmenubar.jar to SDK"
* commit '531c0c33a598632118c5bb5491f5d5295c607b18':
  Add swtmenubar.jar to SDK
2011-04-15 14:56:39 -07:00
Raphael Moll
2e4e3c9421 Merge "Allow swtmenubar module to be buildable on Windows." 2011-04-15 14:42:09 -07:00
Raphael Moll
531c0c33a5 Merge "Add swtmenubar.jar to SDK" 2011-04-15 14:42:05 -07:00
Raphael Moll
59ad18fa49 Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -07:00
Raphael Moll
24434460b6 Add swtmenubar.jar to SDK
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
2011-04-14 21:25:02 -07:00
Ying Wang
e615e85153 resolved conflicts for merge of 8c425a9d to honeycomb-plus-aosp
Change-Id: I5a1045daa1f80d6e6493435e4297363face7dd96
2011-04-14 10:39:13 -07:00
Ying Wang
8c425a9d7c am 479ec682: Merge "Fix "argument list too long""
* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
  Fix "argument list too long"
2011-04-14 10:17:34 -07:00
Ying Wang
479ec68292 Merge "Fix "argument list too long"" 2011-04-14 10:07:38 -07:00
Ying Wang
00985df83a Fix "argument list too long"
Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
2011-04-14 09:59:18 -07:00
David 'Digit' Turner
495283735e full_x86-eng: Ensure we copy the PC bios files.
This change ensures that building full_x86-eng will copy the
Bios files to the right location. This is necessary to launch
"emulator-x86" after building the system images.

Before this patch, one had to make the copy manually. Note that
sdk_x86-eng does not need this (the files are actually taken care
of in build/target/product/sdk.mk so will be copied even in case
of the ARM sdk build).

Change-Id: If70adead27c7997694ebc30561005d26a7358c34
2011-04-14 17:34:40 +02:00
Ying Wang
bdbcc65d0e am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.
* commit '7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
2011-04-13 10:31:50 -07:00
Ying Wang
7c1a1247f3 Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
2011-04-13 10:18:12 -07:00
Ying Wang
91c81750f6 resolved conflicts for merge of 4d9a8556 to honeycomb-plus-aosp
Change-Id: I3914339049e3d302f8542d8ea305905eec480bbb
2011-04-12 13:14:10 -07:00
Ying Wang
4d9a8556ff am e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
* commit 'e442c1361a9066d7a394c080273d5f93d77979e4':
  Add NDK crtbegin_so.o and crtend_so.o if they exist.
2011-04-11 15:35:17 -07:00
Ying Wang
e442c1361a Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." 2011-04-11 10:14:51 -07:00
Ying Wang
cc737a5aa3 Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
2011-04-08 14:57:36 -07:00
Scott Main
5d587a470f am 2218c027: am 63e2c1eb: docs: add Google IO 2011 logo
* commit '2218c027117b10fd909083c8c666bebb074c2167':
  docs: add Google IO 2011 logo
2011-04-01 16:25:04 -07:00
Scott Main
2218c02711 am 63e2c1eb: docs: add Google IO 2011 logo
* commit '63e2c1eba8079caa3288a14041239f7b5018ee92':
  docs: add Google IO 2011 logo
2011-04-01 16:19:26 -07:00
Scott Main
63e2c1eba8 docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
2011-04-01 15:05:12 -07:00
Bruce Beare
6ddd4ead92 x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-04-01 09:09:18 -07:00
Ying Wang
a9be570b5d resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
2011-03-31 18:05:37 -07:00