OSDN Git Service
Jean-Baptiste Queru [Wed, 16 May 2012 14:55:00 +0000 (07:55 -0700)]
am
2436ea8a: Merge "Use i686-linux-android-4.6 for x86 build"
* commit '
2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
Use i686-linux-android-4.6 for x86 build
Jean-Baptiste Queru [Wed, 16 May 2012 13:42:53 +0000 (06:42 -0700)]
Merge "Use i686-linux-android-4.6 for x86 build"
Nick Kralevich [Tue, 15 May 2012 23:39:59 +0000 (16:39 -0700)]
am
9db21482: Merge "stop using a custom linker script for static executables."
* commit '
9db21482369c20120d6f4c1078ce7e0405ba3148':
stop using a custom linker script for static executables.
Nick Kralevich [Tue, 15 May 2012 22:09:25 +0000 (15:09 -0700)]
Merge "stop using a custom linker script for static executables."
Nick Kralevich [Tue, 1 Nov 2011 17:59:35 +0000 (10:59 -0700)]
stop using a custom linker script for static executables.
This is causing problems with making the linker relocatable.
Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
H.J. Lu [Sun, 29 Apr 2012 14:34:54 +0000 (07:34 -0700)]
Use i686-linux-android-4.6 for x86 build
Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
Jean-Baptiste Queru [Sat, 12 May 2012 04:51:52 +0000 (21:51 -0700)]
am
2d7274de: Merge "MIPS generic target support"
* commit '
2d7274de30e35eb13d2934707601ef91ce0f6d4d':
MIPS generic target support
Jean-Baptiste Queru [Fri, 11 May 2012 21:46:37 +0000 (14:46 -0700)]
Merge "MIPS generic target support"
Jean-Baptiste Queru [Fri, 11 May 2012 21:09:16 +0000 (14:09 -0700)]
am
cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '
cd99ece706771d4141b8fc51104224946cf1df65':
x86: customize the malloced address to be 16-byte aligned
Jean-Baptiste Queru [Fri, 11 May 2012 18:25:10 +0000 (11:25 -0700)]
Merge "x86: customize the malloced address to be 16-byte aligned"
Raghu Gandham [Mon, 7 May 2012 14:04:57 +0000 (07:04 -0700)]
MIPS generic target support
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Duane Sand <duanes@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
Jack Ren [Sat, 17 Mar 2012 09:16:48 +0000 (17:16 +0800)]
x86: customize the malloced address to be 16-byte aligned
That can gain better memory performance than 8-byte alignment
Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Mon, 7 May 2012 20:56:19 +0000 (13:56 -0700)]
am
bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit '
bf3d3287acad729c5db51df24ba443ea0d94c9aa':
Use the same compilation flags on OS X 10.8 as 10.7
Jean-Baptiste Queru [Mon, 7 May 2012 16:34:39 +0000 (09:34 -0700)]
Merge "Use the same compilation flags on OS X 10.8 as 10.7"
Al Sutton [Mon, 7 May 2012 08:33:34 +0000 (09:33 +0100)]
Use the same compilation flags on OS X 10.8 as 10.7
Added Mountain Lion to the list of versions which don't need ranlib
and don't need the pre-Lion linker flags
Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5
Signed-off-by: Al Sutton <al@funkyandroid.com>
Jean-Baptiste Queru [Thu, 3 May 2012 00:03:12 +0000 (17:03 -0700)]
am
9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
* commit '
9e4e3b378fd9a62651e216f18dc26cf2b877412a':
TARGET_linux-arm.mk: use single slash version of -print-whatever
Jean-Baptiste Queru [Wed, 2 May 2012 20:26:49 +0000 (13:26 -0700)]
Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
Jean-Baptiste Queru [Wed, 2 May 2012 20:02:26 +0000 (13:02 -0700)]
am
c45cb0bf: Merge "Enable sound effect support in the SDK system image"
* commit '
c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
Enable sound effect support in the SDK system image
Jean-Baptiste Queru [Wed, 2 May 2012 19:20:15 +0000 (12:20 -0700)]
Merge "Enable sound effect support in the SDK system image"
Jun Tian [Wed, 2 May 2012 06:47:04 +0000 (14:47 +0800)]
Enable sound effect support in the SDK system image
Add the missing configuration in sdk.mk to support sound effect in the SDK building.
This patch can fix the CTS sound effect failues of media test in emulator system image.
Change-Id: I8c22e62201d48c2e56fb4c105795bb96ded8f34d
Jean-Baptiste Queru [Wed, 2 May 2012 18:27:36 +0000 (11:27 -0700)]
am
f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
* commit '
f562adc85f05b17c2c10993f3da07e61a7a24b74':
Force use of compatibility compilers on Apple's command line tools
Jean-Baptiste Queru [Wed, 2 May 2012 18:27:35 +0000 (11:27 -0700)]
am
2ba46ecd: Merge "Add Esperanto to the list of locales"
* commit '
2ba46ecdc4bca804ffedc38694910dc1322b42d1':
Add Esperanto to the list of locales
Jean-Baptiste Queru [Wed, 2 May 2012 16:40:13 +0000 (09:40 -0700)]
Merge "Force use of compatibility compilers on Apple's command line tools"
Jean-Baptiste Queru [Wed, 2 May 2012 14:39:15 +0000 (07:39 -0700)]
Merge "Add Esperanto to the list of locales"
Al Sutton [Thu, 23 Feb 2012 18:14:27 +0000 (18:14 +0000)]
Force use of compatibility compilers on Apple's command line tools
The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3
This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.
Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com>
Raphael Moll [Mon, 23 Apr 2012 22:43:35 +0000 (15:43 -0700)]
am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
d0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
The Android Open Source Project [Mon, 23 Apr 2012 21:40:15 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
Raphael Moll [Mon, 23 Apr 2012 19:44:00 +0000 (12:44 -0700)]
Merge "Split target/product/sdk.mk into sdk.git"
Jean-Baptiste Queru [Mon, 23 Apr 2012 16:23:58 +0000 (09:23 -0700)]
am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
Jean-Baptiste Queru [Mon, 23 Apr 2012 15:31:53 +0000 (08:31 -0700)]
Merge "Switch to new locations of toolchains"
Andrew Hsieh [Sat, 21 Apr 2012 07:52:28 +0000 (00:52 -0700)]
am
11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
* commit '
11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
Andrew Hsieh [Fri, 20 Apr 2012 23:52:26 +0000 (16:52 -0700)]
Merge "Add goldfish audio hw to board/generic_x86"
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:25 +0000 (16:43 -0700)]
am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
d0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:23 +0000 (16:43 -0700)]
am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
The Android Automerger [Fri, 20 Apr 2012 23:20:26 +0000 (16:20 -0700)]
IMM76K
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:15:42 +0000 (16:15 -0700)]
Switch to new locations of toolchains
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
Raphael Moll [Fri, 20 Apr 2012 20:43:42 +0000 (13:43 -0700)]
Split target/product/sdk.mk into sdk.git
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
Scott Main [Fri, 20 Apr 2012 17:35:12 +0000 (10:35 -0700)]
am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:19:54 +0000 (10:19 -0700)]
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
Jean-Baptiste Queru [Fri, 20 Apr 2012 15:30:20 +0000 (08:30 -0700)]
Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
Jean-Baptiste Queru [Fri, 20 Apr 2012 15:30:04 +0000 (08:30 -0700)]
Merge "Fix build problems with gcc-4.6.x."
Jing Yu [Fri, 18 Nov 2011 22:13:15 +0000 (14:13 -0800)]
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html
-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.
This patch does not affect gcc-4.4.3 build.
Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
Doug Kwan [Thu, 13 Oct 2011 19:28:34 +0000 (12:28 -0700)]
Fix build problems with gcc-4.6.x.
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
Andrew Hsieh [Fri, 20 Apr 2012 08:08:14 +0000 (16:08 +0800)]
Add goldfish audio hw to board/generic_x86
Without it, app with audio may crash x86 emulator
Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
Scott Main [Fri, 20 Apr 2012 02:27:39 +0000 (19:27 -0700)]
am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:23:04 +0000 (19:23 -0700)]
docs: update doc template to make the Resources side nav wider (+40px)
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
The Android Automerger [Thu, 19 Apr 2012 19:15:03 +0000 (12:15 -0700)]
IMM76J
David Turner [Tue, 17 Apr 2012 11:49:17 +0000 (04:49 -0700)]
am
f04ee373: Merge "Update gdbclient for x86 target"
* commit '
f04ee373123fab58dfd3adc06966cfe127abf6a6':
Update gdbclient for x86 target
David Turner [Tue, 17 Apr 2012 09:27:48 +0000 (02:27 -0700)]
Merge "Update gdbclient for x86 target"
The Android Automerger [Fri, 13 Apr 2012 21:20:51 +0000 (14:20 -0700)]
IMM76I
Raphael Moll [Tue, 10 Apr 2012 21:44:37 +0000 (14:44 -0700)]
am
2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
* commit '
2db32730e79cafcf13e1f898a7bee7f82b0449d6':
Merge "SDK: Also read sdk/build/tools.OS.atree"
Raphael Moll [Tue, 10 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
Raphael Moll [Fri, 2 Mar 2012 20:40:04 +0000 (12:40 -0800)]
Merge "SDK: Also read sdk/build/tools.OS.atree"
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.
(cherry picked from commit
3ab307a68cbc30ab37d15f62e88dd19b51ac9632)
Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:09:40 +0000 (11:09 -0700)]
am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
59d7372dec8b4befa06496b94bd7eef06d506696':
Bump DX Java heap to 2GB.
Mark D Horn [Wed, 14 Mar 2012 21:20:30 +0000 (14:20 -0700)]
Update gdbclient for x86 target
Check the Target Architecture to choose the correct
version of the gdb client.
Change-Id: I1d75df235a18e60c6a7142a95c93b0fce69ee736
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Jean-Baptiste Queru [Tue, 10 Apr 2012 16:39:08 +0000 (09:39 -0700)]
Merge "Bump DX Java heap to 2GB."
Jean-Baptiste Queru [Tue, 10 Apr 2012 15:21:21 +0000 (08:21 -0700)]
Bump DX Java heap to 2GB.
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
Kenny Root [Sat, 7 Apr 2012 01:06:09 +0000 (18:06 -0700)]
am
b22f6853: Merge changes I5a63fd61,I7c6f59fe
* commit '
b22f6853d9e6dd45491a20e31a63beda6c0f3717':
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Kenny Root [Fri, 6 Apr 2012 21:42:41 +0000 (14:42 -0700)]
Merge changes I5a63fd61,I7c6f59fe
* changes:
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Stephen Smalley [Thu, 9 Feb 2012 18:36:21 +0000 (13:36 -0500)]
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.
Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
Stephen Smalley [Fri, 13 Jan 2012 13:12:31 +0000 (08:12 -0500)]
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.
Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
The Android Automerger [Thu, 5 Apr 2012 22:48:38 +0000 (15:48 -0700)]
IMM76H
Roman Nurik [Wed, 4 Apr 2012 17:55:53 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:53:51 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
Scott Main [Tue, 3 Apr 2012 21:00:18 +0000 (14:00 -0700)]
am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
1048bd3fb3c34de37375a6f1c8cd10f88411f758':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
Scott Main [Tue, 3 Apr 2012 20:26:25 +0000 (13:26 -0700)]
docs: revert the change that made "new" tags stick on the first line
and thus allow them to wrap.
Change-Id: Id6b68e38a11f4fb314a0408c78bf7e2b543c8d00
The Android Automerger [Mon, 2 Apr 2012 22:31:28 +0000 (15:31 -0700)]
IMM76G
Roman Nurik [Thu, 29 Mar 2012 20:28:37 +0000 (13:28 -0700)]
docs: Android Design: v3 update (CSS changes)
Change-Id: I00ffb845038f3054e03b41582859ecff4ab63a3e
The Android Automerger [Thu, 29 Mar 2012 20:09:16 +0000 (13:09 -0700)]
IMM76F
The Android Automerger [Wed, 28 Mar 2012 21:45:44 +0000 (14:45 -0700)]
IMM76E
Raphael Moll [Wed, 28 Mar 2012 00:55:44 +0000 (17:55 -0700)]
am
b6addfb2: am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
b6addfb250606175ca679c8fb6e549cd98eee5b0':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:55:43 +0000 (17:55 -0700)]
am
2696eb6d: am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
Raphael Moll [Wed, 28 Mar 2012 00:53:32 +0000 (17:53 -0700)]
am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:53:32 +0000 (17:53 -0700)]
am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
Raphael Moll [Tue, 27 Mar 2012 23:16:45 +0000 (16:16 -0700)]
Merge "Allow make 3.82 to be used under Cygwin 1.7"
Raphael Moll [Tue, 27 Mar 2012 17:07:42 +0000 (10:07 -0700)]
Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of
76bf62d75e7d4680dac1522534c56f4b511e5cd1)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
Raphael Moll [Tue, 27 Mar 2012 18:40:46 +0000 (11:40 -0700)]
Merge "SDK atree: support HOST_OUT location."
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:07:09 +0000 (08:07 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 14:37:56 +0000 (07:37 -0700)]
Merge "Fix build"
Glenn Kasten [Tue, 27 Mar 2012 02:15:25 +0000 (19:15 -0700)]
Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
Scott Main [Mon, 26 Mar 2012 21:30:00 +0000 (14:30 -0700)]
am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
Scott Main [Mon, 26 Mar 2012 20:24:14 +0000 (13:24 -0700)]
docs: re-add android design icon, which had been removed from original location
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
The Android Open Source Project [Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)]
Reconcile with ics-mr1-release
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
The Android Automerger [Sun, 25 Mar 2012 19:34:33 +0000 (12:34 -0700)]
IMM76D
The Android Automerger [Fri, 23 Mar 2012 21:38:56 +0000 (14:38 -0700)]
IMM76C
Andrew Hsieh [Thu, 22 Mar 2012 18:03:14 +0000 (11:03 -0700)]
am
2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '
2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Tue, 13 Mar 2012 09:17:35 +0000 (02:17 -0700)]
Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
Raphael Moll [Thu, 22 Mar 2012 04:52:33 +0000 (21:52 -0700)]
SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
The Android Open Source Project [Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)]
Reconcile with ics-mr1-release
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
The Android Automerger [Wed, 21 Mar 2012 00:15:23 +0000 (17:15 -0700)]
IMM76B
Ying Wang [Tue, 20 Mar 2012 22:22:30 +0000 (15:22 -0700)]
am
301843ae: am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 22:20:14 +0000 (15:20 -0700)]
am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 18:05:55 +0000 (11:05 -0700)]
Merge "Fix for "dexopt: No such file or directory" error"
The Android Automerger [Sat, 17 Mar 2012 02:36:35 +0000 (19:36 -0700)]
IMM76
The Android Automerger [Sat, 17 Mar 2012 02:30:18 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Mar 2012 00:16:36 +0000 (17:16 -0700)]
IMM72B
The Android Automerger [Tue, 13 Mar 2012 02:36:17 +0000 (19:36 -0700)]
IMM72
The Android Automerger [Tue, 13 Mar 2012 02:30:56 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 11 Mar 2012 08:58:08 +0000 (00:58 -0800)]
second try