OSDN Git Service
Christopher Hrabia [Sun, 30 Oct 2011 09:41:56 +0000 (17:41 +0800)]
Updated external broadcom driver version
Chih-Wei Huang [Sun, 30 Oct 2011 07:53:58 +0000 (15:53 +0800)]
Merge remote branch 'aosp/gingerbread-mr4-release' into gingerbread-x86
The Android Automerger [Tue, 20 Sep 2011 18:15:16 +0000 (11:15 -0700)]
GWK74C
Change-Id: If8b5d46a73e3f3fd27f331fea1a60850253db68e
The Android Automerger [Tue, 20 Sep 2011 17:57:35 +0000 (10:57 -0700)]
GWK74B
Change-Id: Iac19525df3d9f5bfe7d70cb5e09746685fadf81a
Ed Heyl [Tue, 13 Sep 2011 18:35:44 +0000 (11:35 -0700)]
GWK74
Change-Id: Iaeb2ade7b4f6d964ba70f1e9ed8cf9e369db16a3
The Android Automerger [Tue, 13 Sep 2011 00:17:34 +0000 (17:17 -0700)]
GWK73
Change-Id: Ibe4ffed6b257a075bf2665b43b3f064006524ee1
The Android Automerger [Tue, 13 Sep 2011 00:16:28 +0000 (17:16 -0700)]
keep history after reconcile of gingerbread-release
Ed Heyl [Sun, 11 Sep 2011 18:46:10 +0000 (11:46 -0700)]
update platform version
update build id
Change-Id: I3a07e62b50744b7567fd4ba435f2a8528a2f6008
android-merger [Sat, 10 Sep 2011 03:17:36 +0000 (20:17 -0700)]
fix space
Change-Id: I29601b2fd5ec607868374e222031598835549854
android-merger [Sat, 10 Sep 2011 01:37:23 +0000 (18:37 -0700)]
GRK71 again
Change-Id: I4ad2c1583e83f1208ca1c519ea1c03352f335e61
android-merger [Fri, 9 Sep 2011 23:49:33 +0000 (16:49 -0700)]
GRK71 again
Change-Id: Ib5f68df8ad7022dd0760f38e72c8fc3840be92b4
android-merger [Fri, 9 Sep 2011 21:50:09 +0000 (14:50 -0700)]
GRK71
Change-Id: Ia00607e866b1ce3633eb0cc6051c5a9d70bea7f5
android-merger [Wed, 7 Sep 2011 00:36:11 +0000 (17:36 -0700)]
GRK39D
Change-Id: I3801d5534b4f6bbdbd37cefa74f71a35ea5ffa59
The Android Automerger [Fri, 2 Sep 2011 23:55:24 +0000 (16:55 -0700)]
GWK15H
Change-Id: I0f58082949e91e206fd0dce80a37d107ba240454
android-merger [Thu, 1 Sep 2011 19:10:10 +0000 (12:10 -0700)]
GRK39C
Change-Id: I2df91acada778458f61961966aae6f575900e7b6
android-merger [Tue, 30 Aug 2011 16:14:32 +0000 (09:14 -0700)]
GRK39B
Change-Id: Id36268001249167160dc7ea0908ddb85b69515a4
The Android Automerger [Wed, 10 Aug 2011 00:47:42 +0000 (17:47 -0700)]
GWK15G
Change-Id: Ice488cd27f50a2f100e100d659c737d4bcc09f5c
Chih-Wei Huang [Tue, 9 Aug 2011 07:02:01 +0000 (15:02 +0800)]
generic_x86: enable usb accessory support
android-merger [Mon, 8 Aug 2011 22:48:36 +0000 (15:48 -0700)]
GRK39
Change-Id: Ia4b60a25edae6e8525710ffd11e30308eb22d0db
android-merger [Mon, 8 Aug 2011 22:03:14 +0000 (15:03 -0700)]
GRJ90C
Change-Id: I660b1710592f3bdc0847eb5e6b83dabfd2c7e44c
Chih-Wei Huang [Thu, 4 Aug 2011 02:20:58 +0000 (10:20 +0800)]
generic_x86: enable faketsd
Chih-Wei Huang [Wed, 3 Aug 2011 10:59:31 +0000 (18:59 +0800)]
generic_x86: add hardware acceleration support
Chih-Wei Huang [Wed, 3 Aug 2011 04:16:59 +0000 (12:16 +0800)]
x86: remove obsolete comments
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
Chih-Wei Huang [Thu, 14 Jul 2011 02:17:45 +0000 (10:17 +0800)]
generic_x86: add e2fsprogs tools
Chih-Wei Huang [Tue, 12 Jul 2011 07:35:37 +0000 (15:35 +0800)]
generic_x86: add powerbtnd service
Chih-Wei Huang [Fri, 13 May 2011 02:38:35 +0000 (10:38 +0800)]
generic_x86: init.rc: remove dhcpcd service
Now the service is added by the init scripts automatically.
Chih-Wei Huang [Sun, 24 Apr 2011 14:27:01 +0000 (22:27 +0800)]
kernel.mk: add rules to get source of Broadcom hybrid device driver
Chih-Wei Huang [Thu, 14 Apr 2011 02:52:56 +0000 (10:52 +0800)]
generic_x86: add v86d
Chih-Wei Huang [Sat, 22 Jan 2011 20:00:30 +0000 (04:00 +0800)]
generic_x86: update to Android-x86 style
Chih-Wei Huang [Wed, 3 Aug 2011 04:53:30 +0000 (12:53 +0800)]
Merge branch 'aosp-fix' into gingerbread-x86
Kenny Root [Mon, 18 Jul 2011 20:11:34 +0000 (13:11 -0700)]
Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
Kenny Root [Mon, 18 Jul 2011 18:15:31 +0000 (11:15 -0700)]
Only include "[a-z]*.bash" files for completion
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.
Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
Kenny Root [Fri, 15 Jul 2011 18:07:06 +0000 (11:07 -0700)]
Add bash completion to envsetup
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
David 'Digit' Turner [Wed, 22 Jun 2011 21:18:57 +0000 (23:18 +0200)]
Turn-off implicit GNU Make RC/SCCS rules
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.
Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
Raphael Moll [Tue, 21 Jun 2011 00:25:01 +0000 (17:25 -0700)]
Lunch: don't use a toolchain that doesn't exist.
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.
Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
Raphael Moll [Mon, 20 Jun 2011 23:03:14 +0000 (16:03 -0700)]
Envsetup: Cygwin doesn't have 'ps -o command'.
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.
Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
Dominic Binks [Wed, 9 Mar 2011 20:11:19 +0000 (12:11 -0800)]
Increase the Java heap size for droiddoc
Increasing the Java heap for droiddoc generation from 768 to 1280
megabytes reduces build times by about 2-3 minutes. For fast
build servers this can reduce build times by around 30%. For
slower workstation class machines the build is reduced with no
other obvious undesirable side effects.
Change-Id: I4ff04318ae78fc7b5a5a0499bacfc5527e966ff6
Bruce Beare [Wed, 4 May 2011 03:59:58 +0000 (20:59 -0700)]
x86: Enable -fstack-protector
Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Mark D Horn [Tue, 26 Apr 2011 21:15:26 +0000 (14:15 -0700)]
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>
Jean-Baptiste Queru [Wed, 11 May 2011 17:40:43 +0000 (10:40 -0700)]
Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
Bruce Beare [Fri, 1 Apr 2011 16:09:02 +0000 (09:09 -0700)]
x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Thu, 27 May 2010 18:55:39 +0000 (11:55 -0700)]
Fix "argument list too long"
Bug http://b/issue?id=
2718472
Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
Ying Wang [Fri, 8 Apr 2011 21:57:36 +0000 (14:57 -0700)]
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
Chih-Wei Huang [Sun, 16 Jan 2011 10:31:29 +0000 (18:31 +0800)]
Use my-dir in a consistent way as others
Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
Chris Dearman [Wed, 16 Feb 2011 20:16:09 +0000 (12:16 -0800)]
Fix argument handling in runhat() function
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
David 'Digit' Turner [Tue, 29 Mar 2011 12:27:27 +0000 (14:27 +0200)]
build speedup: Do not use shell 'find' function to look for NOTICE files.
The GNU Make wildcard function can be used to look for a specific file and
is _much_ faster than invoking the find command through $(shell ...).
Since notice_files.mk is included by base_rules.mk for each and every module
in the build tree, this represents a considerable speed-up. For example, when
building the full-eng product from the AOSP tree, the no-op "make" goes from
21 seconds to 16 seconds with this patch applied.
Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
Bruce Beare [Tue, 1 Feb 2011 16:00:09 +0000 (08:00 -0800)]
x86: the -mbionic flag is needed for IA builds.
Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Thu, 27 Jan 2011 02:43:15 +0000 (18:43 -0800)]
x86: Use GCC 4.4.3
Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
Author: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
David 'Digit' Turner [Fri, 11 Feb 2011 15:19:31 +0000 (16:19 +0100)]
core/binary.mk: Add missing Objective-C objects to the build.
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I173811cf11cdb5b045073aade59364236145bc77
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:59:54 +0000 (12:59 -0800)]
partial build fix
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:35:02 +0000 (12:35 -0800)]
partial build fix
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
Bruce Beare [Thu, 27 Jan 2011 21:16:57 +0000 (13:16 -0800)]
Add dnsproxyd to keep in sync with base init.rc
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:18:41 +0000 (08:18 -0800)]
Add a few more legacy modules that can have user tags - do not merge
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
Raphael Moll [Wed, 5 Jan 2011 22:58:17 +0000 (14:58 -0800)]
Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
Bruce Beare [Tue, 28 Dec 2010 23:33:22 +0000 (15:33 -0800)]
generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 21:05:23 +0000 (13:05 -0800)]
Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 20:37:52 +0000 (12:37 -0800)]
GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.
Change-Id: I79a6a71873634a231aa8990cee22374259601505
Magnus Bäck [Mon, 8 Nov 2010 12:44:02 +0000 (13:44 +0100)]
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Commit
e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious
make: *** No rule to make target `all'. Stop.
error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.
Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
Bruce Beare [Thu, 14 Oct 2010 21:12:46 +0000 (14:12 -0700)]
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Thu, 14 Oct 2010 21:31:48 +0000 (14:31 -0700)]
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Thu, 14 Oct 2010 19:21:58 +0000 (12:21 -0700)]
Display the TARGET_ARCH_VARIANT
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Johnnie Birch [Mon, 2 Aug 2010 19:12:15 +0000 (12:12 -0700)]
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
Chih-Wei Huang [Wed, 3 Nov 2010 10:33:46 +0000 (18:33 +0800)]
Add version_defaults.mk to be a prerequisite of build.prop
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
Raphael Moll [Thu, 28 Oct 2010 02:06:12 +0000 (19:06 -0700)]
Fix "make acp" under Cygwin. DO NOT MERGE.
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:34:32 +0000 (12:34 -0700)]
Fix list of locales (bad country codes).
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
Jean-Baptiste Queru [Fri, 22 Oct 2010 17:22:42 +0000 (10:22 -0700)]
Make a full list of locales available
Use it for the sim build and full build.
Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
Gary King [Tue, 9 Mar 2010 01:16:57 +0000 (17:16 -0800)]
[build] move dumpvar.mk include after select.mk include
because the dumpvar target was included early in envsetup.mk, it was
not possible to use it to dump variables that were defined by makefiles
included later (like the toolchain variables in combo/select.mk).
move dumpvar.mk to after select.mk and javac.mk, so that shell functions
can be created using the toolchain build variables
Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb
Signed-off-by: Gary King <gking@nvidia.com>
Chih-Wei Huang [Mon, 26 Jul 2010 02:41:38 +0000 (10:41 +0800)]
Add atom optimization flags
To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.
Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
Thorsten Glaser [Thu, 3 Jun 2010 17:58:02 +0000 (19:58 +0200)]
For the generic board, set /system/bin/sh to mksh to test the transition
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
Thorsten Glaser [Thu, 3 Jun 2010 17:57:02 +0000 (19:57 +0200)]
Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual
Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
Jeffrey Chyan [Wed, 7 Jul 2010 18:42:19 +0000 (13:42 -0500)]
Allow explicit warnings for projects
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.
Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
Bruce Beare [Mon, 12 Jul 2010 18:32:37 +0000 (11:32 -0700)]
Move buildspec vars to BoardConfig.mk
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Mon, 12 Jul 2010 17:12:44 +0000 (10:12 -0700)]
Add generic_x86-eng to the lunch menu
Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Thu, 8 Jul 2010 21:59:16 +0000 (14:59 -0700)]
Define __ANDROID__ for x86 to be on par with ARM build requirements
Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Thu, 24 Jun 2010 20:51:35 +0000 (13:51 -0700)]
Vendorsetup needs to look in additional places.
Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Mon, 12 Jul 2010 14:53:28 +0000 (07:53 -0700)]
Allow TARGET_ARCH to be set from BoardConfig.mk
Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 9 Jul 2010 20:25:41 +0000 (13:25 -0700)]
Fix build - USE_MINGW seems to be the preferred define
Change-Id: I57dd7f5029ed1fe3a74be7573a28fa894187b3a7
Kan-Ru Chen [Mon, 5 Jul 2010 09:04:37 +0000 (17:04 +0800)]
acp: Ensure dst mtime always greater or equal to src mtime
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I2b4200c72c4e6ee8aae875b5e64701324799afc7
Bruce Beare [Thu, 24 Jun 2010 21:02:00 +0000 (14:02 -0700)]
Refactor Stripper. Allow a stripper other than SOSLIM to be specified
Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Chih-Wei Huang [Fri, 9 Jul 2010 02:07:52 +0000 (10:07 +0800)]
Set arm specific variables to be empty for non-arm platforms
These variables are useless for non-arm platforms, and will
generate misleading messages during building process.
Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
Chris Peterson [Sat, 26 Jun 2010 00:31:30 +0000 (17:31 -0700)]
update 404'd source.android.com URLs
Change-Id: If305c7f6f3ac3624568de258bdc13b142ad32cf9
Bruce Beare [Tue, 29 Jun 2010 22:50:29 +0000 (15:50 -0700)]
Update to latest (froyo) init.rc
Change-Id: Ibbf5427261dbb84cdc28c6de931e65c8cac547a6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Kan-Ru Chen [Mon, 5 Jul 2010 07:53:47 +0000 (15:53 +0800)]
Explicitly indicates that only bash is supported.
Remove all zsh compatibility code and related comments.
Display a warning when other shell is used, to prevent the illusion
that building under Zsh is supported when it's not.
Change-Id: Ie6d43ace3a30bde99aad45b00d25007ac28d5155
Chih-Wei Huang [Mon, 31 Aug 2009 06:55:33 +0000 (14:55 +0800)]
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
Chih-Wei Huang [Wed, 16 Mar 2011 02:37:30 +0000 (10:37 +0800)]
add rules to generate system.sfs
Chih-Wei Huang [Wed, 16 Mar 2011 02:36:30 +0000 (10:36 +0800)]
add kernel.mk to build kernel image on-fly
The patch collapses all changes of kernel.mk into one.
Change-Id: I91bf0499c055bc50ed66a8b4c288ffbaa6cdf6cf
Yi Sun [Fri, 21 Aug 2009 01:04:13 +0000 (18:04 -0700)]
initial commit for the ethernet state tracker work.
The Android Automerger [Tue, 2 Aug 2011 23:56:15 +0000 (16:56 -0700)]
GWK15F
Change-Id: If34f003efe36006666e68ab39313772257ea1b45
Dan Morrill [Tue, 2 Aug 2011 23:46:38 +0000 (16:46 -0700)]
Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
The Android Automerger [Tue, 2 Aug 2011 23:52:03 +0000 (16:52 -0700)]
Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
Conflicts:
core/build_id.mk
Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
Dan Morrill [Tue, 2 Aug 2011 22:36:05 +0000 (15:36 -0700)]
Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
android-merger [Tue, 2 Aug 2011 23:07:09 +0000 (16:07 -0700)]
GRJ90B
Change-Id: I8da7004b84d8f3df0fee126b178d8bcbcb7b6eb1
The Android Automerger [Fri, 29 Jul 2011 20:46:55 +0000 (13:46 -0700)]
GWK15E
Change-Id: I60b7f8f0883594ed648ee1d97c0ac221645fa7a0
The Android Automerger [Mon, 25 Jul 2011 22:56:36 +0000 (15:56 -0700)]
GWK15D
Change-Id: I5db71a9c7d02a03682600ac958b8fcb8d3ae2a57
The Android Automerger [Mon, 25 Jul 2011 18:33:40 +0000 (11:33 -0700)]
GWK15C
Change-Id: I8484258e2dafc03f84c2e8b512f87e4c1ad8f3fe
The Android Automerger [Wed, 20 Jul 2011 15:33:57 +0000 (08:33 -0700)]
GWK15B
Change-Id: Ic5b7128218c8d7a20b85b5208b158f7901b6ac20
The Android Automerger [Wed, 20 Jul 2011 07:27:31 +0000 (00:27 -0700)]
Set BUILD_ID to GWK15B.
Change-Id: Ia4cd9cba4771c2793afb1d4812157719437b0662
The Android Automerger [Fri, 15 Jul 2011 21:55:43 +0000 (14:55 -0700)]
GWK15
Change-Id: Ie8bb113d5c260d11a662c5fcc74b46bcab4a90ad
The Android Automerger [Fri, 15 Jul 2011 05:26:02 +0000 (22:26 -0700)]
GWK14B
Change-Id: I26218c911d10efd23801652459887583ab389a05
OSDN Git Service
