ee69da5b4e
am 5aa44e2d: Merge bb41d06d
...
* commit '5aa44e2d7a15a743113aab386e465492d101e2bd':
Update version to 2.3.5.
2011-06-16 07:46:17 -07:00
5aa44e2d7a
Merge bb41d06d
...
Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf
2011-06-16 07:19:44 -07:00
3f72af1370
Merge cb5b6d16
...
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
2011-06-10 07:29:48 -07:00
cb5b6d1690
am 0b22d93b: Welcome, Android 3.2.
...
* commit '0b22d93be32eeff06e6626ad766b040057b931a5':
Welcome, Android 3.2.
2011-06-09 17:25:43 -07:00
0b22d93be3
Welcome, Android 3.2.
...
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
2011-06-09 16:40:02 -07:00
bb41d06d96
Update version to 2.3.5.
...
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
2011-06-09 13:20:55 -07:00
d23d0f0764
am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge)
...
* commit 'ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
add ANDROID_HOST_OUT to env (please do not merge)
2011-06-07 13:15:20 -07:00
f0d2a54669
Merge 78e7f1f0
...
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
2011-06-07 13:11:14 -07:00
0a6c12be9b
Merge 5adc2d05
...
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
2011-06-07 13:10:18 -07:00
45a3ad7d22
Merge c1efb060
...
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
ec6648036e
am c811f291: add ANDROID_HOST_OUT to env (please do not merge)
...
* commit 'c811f29198fc4862e22dbf233bc28210d14e0205':
add ANDROID_HOST_OUT to env (please do not merge)
2011-06-07 12:55:39 -07:00
c811f29198
add ANDROID_HOST_OUT to env (please do not merge)
...
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
2011-06-07 12:35:46 -07:00
60d6ef91b6
am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks.
...
* commit '1482d2db83abaa7d9a01831bdaeb99d4a68fd68a':
Support to run dex-preopt on prebuilt apks.
2011-06-06 17:29:49 -07:00
0a2d335e99
am c1705c9a: Merge "x86: Enable -fstack-protector"
...
* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
x86: Enable -fstack-protector
2011-06-06 12:27:26 -07:00
e4778e6ab8
am 4272b32a: Merge "Clean up of X86 build flags"
...
* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
Clean up of X86 build flags
2011-06-06 11:33:04 -07:00
78e7f1f014
am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"
...
* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
Increase the Java heap size for droiddoc
2011-06-06 08:23:09 -07:00
536938e011
am 978f86ea: Merge "Increase the Java heap size for droiddoc"
...
* commit '978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
2011-06-06 08:19:48 -07:00
978f86ea54
Merge "Increase the Java heap size for droiddoc"
2011-06-06 08:12:31 -07:00
5adc2d054f
am c33e0739: Merge from gingerbread
...
* commit 'c33e07396b4de4453c9212aaeb13c0c36b875589':
2011-06-01 14:26:18 -07:00
c33e07396b
Merge from gingerbread
...
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
2011-06-01 14:09:28 -07:00
c1efb06045
am 3c60c67a: Merge from open-source gingerbread
...
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
3c60c67ad2
Merge from open-source gingerbread
...
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
2011-06-01 07:42:19 -07:00
8cbdef7eba
Merge "Relax the constraint of 64bit build environment." into gingerbread
2011-05-31 14:03:21 -07:00
823f63894f
am 3487736b: am 7d83ef8f: Support custom RenderScript compiler
...
* commit '3487736bac5625bef8ff9bc4ef311b29348055d9':
Support custom RenderScript compiler
2011-05-27 15:38:10 -07:00
3487736bac
am 7d83ef8f: Support custom RenderScript compiler
...
* commit '7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
Support custom RenderScript compiler
2011-05-27 15:35:48 -07:00
7d83ef8ff7
Support custom RenderScript compiler
...
Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
2011-05-27 13:47:17 -07:00
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
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
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
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
1482d2db83
am e2419c89: Support to run dex-preopt on prebuilt apks.
...
* commit 'e2419c89cef4eeae1b6cd113ef1c92d397834841':
Support to run dex-preopt on prebuilt apks.
2011-05-26 17:10:37 -07:00
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
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
06e2f72bc9
Support to run dex-preopt on prebuilt apks.
...
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
2011-05-26 16:01:57 -07:00
e2419c89ce
Support to run dex-preopt on prebuilt apks.
...
Change-Id: I11450310144cb8d7f127c427ada4a0589e030843
2011-05-26 15:59:56 -07:00
c1705c9ad8
Merge "x86: Enable -fstack-protector"
2011-05-26 09:21:35 -07:00
e397dcccbb
x86: Enable -fstack-protector
...
Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-05-26 08:53:04 -07:00
4272b32a86
Merge "Clean up of X86 build flags"
2011-05-24 22:58:20 -07:00
053dccb159
Relax the constraint of 64bit build environment.
...
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
cdef404572
Merge 5d66a07d - do not merge
...
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
5d66a07d44
Merge "Use actual numbers in version numbers."
2011-05-19 13:57:00 -07:00
5812d7b469
Clean up of X86 build flags
...
Review and clean-up of both compiler and linker flags
to ensure proper usage and consistency for images, toolchain,
SDK, and NDK.
Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>
2011-05-18 14:10:58 -07:00
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
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
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
faf8baaff1
docs: make featured video titles smaller so they don't line wrap
...
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
2011-05-16 12:14:17 -07:00
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
5372220a1a
Merge "Remove simulator from the lunch menu"
2011-05-12 08:04:50 -07:00
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
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