OSDN Git Service

android-x86/build.git
12 years agoam c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:45:49 +0000 (16:45 -0700)]
am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."

* commit 'c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
  Fix build problems with gcc-4.6.x.

12 years agoam 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
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.

12 years agoam 7a086316: am 6b719da3: docs: update sidenav-width-adjust script so Training classe...
Scott Main [Fri, 20 Apr 2012 17:38:15 +0000 (10:38 -0700)]
am 7a086316: am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section

* commit '7a086316424925fb33ed470116563712e7754f8b':

12 years agoam 9041aa50: am 6b719da3: docs: update sidenav-width-adjust script so Training classe...
Scott Main [Fri, 20 Apr 2012 17:37:32 +0000 (10:37 -0700)]
am 9041aa50: am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section

* commit '9041aa50fbdb2cff512617a0377385c7d5ada663':
  docs: update sidenav-width-adjust script so Training classes save the width for the Resources section

12 years agoam 6b719da3: docs: update sidenav-width-adjust script so Training classes save the...
Scott Main [Fri, 20 Apr 2012 17:35:33 +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

12 years agoam 6b719da3: docs: update sidenav-width-adjust script so Training classes save the...
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

12 years agodocs: update sidenav-width-adjust script so Training classes save the width for the...
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

12 years agoMerge "Fix build problems with gcc-4.6.x."
Jean-Baptiste Queru [Fri, 20 Apr 2012 15:30:04 +0000 (08:30 -0700)]
Merge "Fix build problems with gcc-4.6.x."

12 years agoFix build problems with gcc-4.6.x.
Doug Kwan [Thu, 13 Oct 2011 19:28:34 +0000 (12:28 -0700)]
Fix build problems with gcc-4.6.x.

Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4

12 years agoam b3d8eecd: am 76b0139a: docs: update doc template to make the Resources side nav...
Scott Main [Fri, 20 Apr 2012 02:31:16 +0000 (19:31 -0700)]
am b3d8eecd: am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)

* commit 'b3d8eecd9ca47ac369ce420b6da21947a6a6d84f':

12 years agoam 27e53840: am 76b0139a: docs: update doc template to make the Resources side nav...
Scott Main [Fri, 20 Apr 2012 02:29:49 +0000 (19:29 -0700)]
am 27e53840: am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)

* commit '27e538405495b3d36b2750e376706e0ad583a03c':
  docs: update doc template to make the Resources side nav wider (+40px)

12 years agoam 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:28:10 +0000 (19:28 -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)

12 years agoam 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
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)

12 years agodocs: 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

12 years agoam 81d54025: am f04ee373: Merge "Update gdbclient for x86 target"
David Turner [Tue, 17 Apr 2012 11:51:52 +0000 (04:51 -0700)]
am 81d54025: am f04ee373: Merge "Update gdbclient for x86 target"

* commit '81d54025c75793c9f8cb2290c81b4075f9274be1':
  Update gdbclient for x86 target

12 years agoam f04ee373: Merge "Update gdbclient for x86 target"
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

12 years agoMerge "Update gdbclient for x86 target"
David Turner [Tue, 17 Apr 2012 09:27:48 +0000 (02:27 -0700)]
Merge "Update gdbclient for x86 target"

12 years agoam 8f5c42e7: am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
Raphael Moll [Tue, 10 Apr 2012 21:46:43 +0000 (14:46 -0700)]
am 8f5c42e7: am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""

* commit '8f5c42e778afc5a3bfa2c6a1c6258889690a558b':
  Merge "SDK: Also read sdk/build/tools.OS.atree"

12 years agoam 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
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"

12 years agoMerge "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""

12 years agoMerge "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

12 years agoam 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:11:50 +0000 (11:11 -0700)]
am 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."

* commit '33c98d9ab283913b7b76d8a33e138aafe9724d68':
  Bump DX Java heap to 2GB.

12 years agoam 59d7372d: Merge "Bump DX Java heap to 2GB."
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.

12 years agoUpdate gdbclient for x86 target
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>
12 years agoMerge "Bump DX Java heap to 2GB."
Jean-Baptiste Queru [Tue, 10 Apr 2012 16:39:08 +0000 (09:39 -0700)]
Merge "Bump DX Java heap to 2GB."

12 years agoBump 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

12 years agoam 026e219f: am b22f6853: Merge changes I5a63fd61,I7c6f59fe
Kenny Root [Sat, 7 Apr 2012 01:07:44 +0000 (18:07 -0700)]
am 026e219f: am b22f6853: Merge changes I5a63fd61,I7c6f59fe

* commit '026e219f780a1d257e78fe80419a10655dc615a8':
  Support the setting of file security contexts in OTA and update packages.
  Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.

12 years agoam b22f6853: Merge changes I5a63fd61,I7c6f59fe
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.

12 years agoMerge changes I5a63fd61,I7c6f59fe
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.

12 years agoSupport the setting of file security contexts in OTA and update packages.
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

12 years agoPass the file_contexts configuration to mkyaffs2image and make_ext4fs.
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

12 years agoam c403055b: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into...
Roman Nurik [Wed, 4 Apr 2012 17:58:50 +0000 (10:58 -0700)]
am c403055b: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1

* commit 'c403055b10331e717fbe2420f4b92ce99e30e3f2':

12 years agoam dceeaac8: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into...
Roman Nurik [Wed, 4 Apr 2012 17:58:16 +0000 (10:58 -0700)]
am dceeaac8: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1

* commit 'dceeaac8bf6e4b71885a1468a32ffad1324d0022':
  docs: Android Design: v3 update (CSS changes)

12 years agoam 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
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)

12 years agoam 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
Roman Nurik [Wed, 4 Apr 2012 17:55:35 +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)

12 years agoMerge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
Roman Nurik [Wed, 4 Apr 2012 17:53:51 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1

12 years agoam 4221fdbd: am 1048bd3f: docs: revert the change that made "new" tags stick on the...
Scott Main [Tue, 3 Apr 2012 21:07:59 +0000 (14:07 -0700)]
am 4221fdbd: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.

* commit '4221fdbde9c240cdae20d837867d7fd0a5977273':

12 years agoam 0af1d53e: am 1048bd3f: docs: revert the change that made "new" tags stick on the...
Scott Main [Tue, 3 Apr 2012 21:06:28 +0000 (14:06 -0700)]
am 0af1d53e: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.

* commit '0af1d53ef2db4c1e72b675e9868610e1d6b11236':
  docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.

12 years agoam 1048bd3f: docs: revert the change that made "new" tags stick on the first line...
Scott Main [Tue, 3 Apr 2012 21:02:40 +0000 (14:02 -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.

12 years agoam 1048bd3f: docs: revert the change that made "new" tags stick on the first line...
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.

12 years agodocs: revert the change that made "new" tags stick on the first line
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

12 years agodocs: Android Design: v3 update (CSS changes)
Roman Nurik [Thu, 29 Mar 2012 20:28:37 +0000 (13:28 -0700)]
docs: Android Design: v3 update (CSS changes)

Change-Id: I00ffb845038f3054e03b41582859ecff4ab63a3e

12 years agoam f515ad27: am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin...
Raphael Moll [Wed, 28 Mar 2012 00:57:40 +0000 (17:57 -0700)]
am f515ad27: am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"

* commit 'f515ad27974dc18a2ae2579cee16a800d539d06d':
  Allow make 3.82 to be used under Cygwin 1.7

12 years agoam d0bcf386: am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
Raphael Moll [Wed, 28 Mar 2012 00:57:39 +0000 (17:57 -0700)]
am d0bcf386: am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."

* commit 'd0bcf3869e8f60892dea6983ed2b9ff6e6d203f5':
  SDK atree: support HOST_OUT location.

12 years agoam b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
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

12 years agoam 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
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.

12 years agoam a8dd58a8: Merge "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 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

12 years agoam 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
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.

12 years agoMerge "Allow make 3.82 to be used under Cygwin 1.7"
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"

12 years agoAllow 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

12 years agoMerge "SDK atree: support HOST_OUT location."
Raphael Moll [Tue, 27 Mar 2012 18:40:46 +0000 (11:40 -0700)]
Merge "SDK atree: support HOST_OUT location."

12 years agoam acd30108: am d17c8977: am 0b6a436f: Merge "Fix build"
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:11:09 +0000 (08:11 -0700)]
am acd30108: am d17c8977: am 0b6a436f: Merge "Fix build"

* commit 'acd3010843b4e646ac53685054d82ad7bd88893c':
  Fix build

12 years agoam d17c8977: am 0b6a436f: Merge "Fix build"
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)]
am d17c8977: am 0b6a436f: Merge "Fix build"

* commit 'd17c89776e71f61852ac6ec3a75859a832cf1ba6':
  Fix build

12 years agoam 0b6a436f: Merge "Fix build"
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:07:09 +0000 (08:07 -0700)]
am 0b6a436f: Merge "Fix build"

* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
  Fix build

12 years agoMerge "Fix build"
Jean-Baptiste Queru [Tue, 27 Mar 2012 14:37:56 +0000 (07:37 -0700)]
Merge "Fix build"

12 years agoFix build
Glenn Kasten [Tue, 27 Mar 2012 02:15:25 +0000 (19:15 -0700)]
Fix build

Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784

12 years agoam dde474b6: am 33666ade: docs: re-add android design icon, which had been removed...
Scott Main [Mon, 26 Mar 2012 21:54:08 +0000 (14:54 -0700)]
am dde474b6: am 33666ade: docs: re-add android design icon, which had been removed from original location

* commit 'dde474b61822bc867ece1310125343f9937d384f':

12 years agoam 0701c756: am 33666ade: docs: re-add android design icon, which had been removed...
Scott Main [Mon, 26 Mar 2012 21:32:23 +0000 (14:32 -0700)]
am 0701c756: am 33666ade: docs: re-add android design icon, which had been removed from original location

* commit '0701c756bc81d17cb5b0a8646d22fb1969f6bd77':
  docs: re-add android design icon, which had been removed from original location

12 years agoam 33666ade: docs: re-add android design icon, which had been removed from original...
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

12 years agoam 33666ade: docs: re-add android design icon, which had been removed from original...
Scott Main [Mon, 26 Mar 2012 21:29:21 +0000 (14:29 -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

12 years agodocs: 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

12 years agoam 6aa8411f: Reconcile with ics-mr1-release
The Android Open Source Project [Mon, 26 Mar 2012 17:21:29 +0000 (10:21 -0700)]
am 6aa8411f: Reconcile with ics-mr1-release

* commit '6aa8411f2f1258cecd4c1fb593195568d08fef18':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)]
Reconcile with ics-mr1-release

Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2

12 years agoam 6e271c76: Reconcile with ics-mr1-release
The Android Open Source Project [Mon, 26 Mar 2012 16:49:11 +0000 (09:49 -0700)]
am 6e271c76: Reconcile with ics-mr1-release

* commit '6e271c76b6906da529804c3672115a9a88fd8e30':
  IMM76D
  IMM76C

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)]
Reconcile with ics-mr1-release

Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157

12 years agoIMM76D
The Android Automerger [Sun, 25 Mar 2012 19:34:33 +0000 (12:34 -0700)]
IMM76D

12 years agoIMM76C
The Android Automerger [Fri, 23 Mar 2012 21:38:56 +0000 (14:38 -0700)]
IMM76C

12 years agoam 5d9aedef: am 2245d17d: Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Thu, 22 Mar 2012 18:06:34 +0000 (11:06 -0700)]
am 5d9aedef: am 2245d17d: Point to new linux prebuilt toolchain for SDK build

* commit '5d9aedef3067d458e356a6c13a26ad71041ff04b':
  Point to new linux prebuilt toolchain for SDK build

12 years agoam 2245d17d: Point to new linux prebuilt toolchain for SDK build
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

12 years agoPoint 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

12 years agoSDK atree: support HOST_OUT location.
Raphael Moll [Thu, 22 Mar 2012 04:52:33 +0000 (21:52 -0700)]
SDK atree: support HOST_OUT location.

Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e

12 years agoam 8544aac8: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 16:03:25 +0000 (09:03 -0700)]
am 8544aac8: Reconcile with ics-mr1-release

* commit '8544aac859400ee7c0109f996930b22455028dbe':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)]
Reconcile with ics-mr1-release

Change-Id: If78df17136dfe425e6752b315590b47d4c135d21

12 years agoam 7000342d: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 15:25:04 +0000 (08:25 -0700)]
am 7000342d: Reconcile with ics-mr1-release

* commit '7000342da9241170fa831a8ec887ecc6f4aa426d':
  IMM76B
  IMM76
  IMM72B
  IMM72
  second try
  IMM68C
  IMM70
  IMM62B
  IMM69
  IMM68B
  IMM68

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)]
Reconcile with ics-mr1-release

Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8

12 years agoIMM76B
The Android Automerger [Wed, 21 Mar 2012 00:15:23 +0000 (17:15 -0700)]
IMM76B

12 years agoam 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or direct...
Ying Wang [Tue, 20 Mar 2012 22:24:55 +0000 (15:24 -0700)]
am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"

* commit '4243532d4a0ec368d6722265af94ebd962877623':
  Fix for "dexopt: No such file or directory" error

12 years agoam 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
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

12 years agoam 29e44b7a: Merge "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

12 years agoMerge "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"

12 years agoIMM76
The Android Automerger [Sat, 17 Mar 2012 02:36:35 +0000 (19:36 -0700)]
IMM76

12 years agomerge in ics-mr1-release history after reset to ics-mr1
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

12 years agoIMM72B
The Android Automerger [Wed, 14 Mar 2012 00:16:36 +0000 (17:16 -0700)]
IMM72B

12 years agoIMM72
The Android Automerger [Tue, 13 Mar 2012 02:36:17 +0000 (19:36 -0700)]
IMM72

12 years agomerge in ics-mr1-release history after reset to ics-mr1
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

12 years agosecond try
The Android Automerger [Sun, 11 Mar 2012 08:58:08 +0000 (00:58 -0800)]
second try

12 years agoIMM68C
The Android Automerger [Sat, 10 Mar 2012 17:10:29 +0000 (09:10 -0800)]
IMM68C

12 years agoIMM70
The Android Automerger [Sat, 10 Mar 2012 17:08:53 +0000 (09:08 -0800)]
IMM70

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 17:06:03 +0000 (09:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoIMM62B
The Android Automerger [Sat, 10 Mar 2012 03:28:10 +0000 (19:28 -0800)]
IMM62B

12 years agoIMM69
The Android Automerger [Sat, 10 Mar 2012 03:25:45 +0000 (19:25 -0800)]
IMM69

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:22:16 +0000 (19:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoIMM68B
The Android Automerger [Fri, 9 Mar 2012 17:59:12 +0000 (09:59 -0800)]
IMM68B

12 years agoIMM68
The Android Automerger [Fri, 9 Mar 2012 04:49:08 +0000 (20:49 -0800)]
IMM68

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Mar 2012 04:42:40 +0000 (20:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 0d1630a3: am d9ca90b4: Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:54:16 +0000 (14:54 -0800)]
am 0d1630a3: am d9ca90b4: Add SDK template and assets for Android Design

* commit '0d1630a34dc6ecf59c67ee4a51569fe7e933649d':

12 years agoam a23a3d83: am d9ca90b4: Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:43:02 +0000 (14:43 -0800)]
am a23a3d83: am d9ca90b4: Add SDK template and assets for Android Design

* commit 'a23a3d83143911358dd917a9f7f4cd9b097e4af8':
  Add SDK template and assets for Android Design

12 years agoam d9ca90b4: Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:41:33 +0000 (14:41 -0800)]
am d9ca90b4: Add SDK template and assets for Android Design

* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
  Add SDK template and assets for Android Design

12 years agoam d9ca90b4: Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:41:13 +0000 (14:41 -0800)]
am d9ca90b4: Add SDK template and assets for Android Design

* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
  Add SDK template and assets for Android Design

12 years agoAdd SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 20:25:34 +0000 (12:25 -0800)]
Add SDK template and assets for Android Design

Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f