OSDN Git Service

android-x86/build.git
13 years agoam 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"
David Turner [Mon, 6 Jun 2011 21:39:32 +0000 (14:39 -0700)]
am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"

* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
  x86: Enable -fstack-protector

13 years agoMerge "Revert "Clear LOCAL_RTTI_FLAG.""
Doug Kwan [Mon, 6 Jun 2011 20:20:49 +0000 (13:20 -0700)]
Merge "Revert "Clear LOCAL_RTTI_FLAG.""

13 years agoam e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags"
David Turner [Mon, 6 Jun 2011 19:56:15 +0000 (12:56 -0700)]
am e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags"

* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
  Clean up of X86 build flags

13 years agoam c1705c9a: Merge "x86: Enable -fstack-protector"
David Turner [Mon, 6 Jun 2011 19:27:26 +0000 (12:27 -0700)]
am c1705c9a: Merge "x86: Enable -fstack-protector"

* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
  x86: Enable -fstack-protector

13 years agoRevert "Clear LOCAL_RTTI_FLAG."
Doug Kwan [Mon, 6 Jun 2011 19:11:19 +0000 (12:11 -0700)]
Revert "Clear LOCAL_RTTI_FLAG."

This reverts commit f524df7ce1a5e276607563272fa1838967a4a239.

13 years agoMerge "Clear LOCAL_RTTI_FLAG."
Doug Kwan [Mon, 6 Jun 2011 18:35:08 +0000 (11:35 -0700)]
Merge "Clear LOCAL_RTTI_FLAG."

13 years agoam 4272b32a: Merge "Clean up of X86 build flags"
David Turner [Mon, 6 Jun 2011 18:33:04 +0000 (11:33 -0700)]
am 4272b32a: Merge "Clean up of X86 build flags"

* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
  Clean up of X86 build flags

13 years agoFix typo
Jean-Baptiste Queru [Mon, 6 Jun 2011 17:20:04 +0000 (10:20 -0700)]
Fix typo

Change-Id: I45e5fbe272f837e751eea14162432de1af1c67a2

13 years agoTweak apps in "full" configs.
Jean-Baptiste Queru [Mon, 6 Jun 2011 16:50:15 +0000 (09:50 -0700)]
Tweak apps in "full" configs.

Add new apps. Also move VoiceDialer to only appear in
telephony-enabled builds.

Change-Id: I3560c19f841296be0c7438553e870df12a4c8cda

13 years agoClear LOCAL_RTTI_FLAG.
Doug Kwan [Sat, 4 Jun 2011 01:26:48 +0000 (18:26 -0700)]
Clear LOCAL_RTTI_FLAG.

Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba

13 years agoam 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compiler
Ying Wang [Thu, 2 Jun 2011 23:49:33 +0000 (16:49 -0700)]
am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compiler

* commit '823f63894fb4ad5c1280a5ee7eb004792223a488':
  Support custom RenderScript compiler

13 years agoam 9b6614d5: am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide...
Scott Main [Thu, 2 Jun 2011 23:22:44 +0000 (16:22 -0700)]
am 9b6614d5: 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 '9b6614d58bf3ed4ad127bc607405af834c349662':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08

13 years agoam bb567df0: am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 2 Jun 2011 21:06:24 +0000 (14:06 -0700)]
am bb567df0: am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit 'bb567df00abfe33d800339eba089b8cfd91a7785':
  Support to run dex-preopt on prebuilt apks.

13 years agoMerge "Allow enabling RTTI in a module."
Doug Kwan [Wed, 1 Jun 2011 18:23:20 +0000 (11:23 -0700)]
Merge "Allow enabling RTTI in a module."

13 years agoSwitch the java encoding from ascii to utf8.
Joe Onorato [Wed, 1 Jun 2011 01:21:07 +0000 (18:21 -0700)]
Switch the java encoding from ascii to utf8.

Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d

13 years agoClean up how dex preoptimization gets configured.
Dan Bornstein [Tue, 31 May 2011 17:29:47 +0000 (10:29 -0700)]
Clean up how dex preoptimization gets configured.

Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5

13 years agoMerge "add sensorservice package to the list"
Mathias Agopian [Fri, 27 May 2011 23:38:05 +0000 (16:38 -0700)]
Merge "add sensorservice package to the list"

13 years agoam 3487736b: am 7d83ef8f: Support custom RenderScript compiler
Ying Wang [Fri, 27 May 2011 22:38:10 +0000 (15:38 -0700)]
am 3487736b: am 7d83ef8f: Support custom RenderScript compiler

* commit '3487736bac5625bef8ff9bc4ef311b29348055d9':
  Support custom RenderScript compiler

13 years agoam 7d83ef8f: Support custom RenderScript compiler
Ying Wang [Fri, 27 May 2011 22:35:48 +0000 (15:35 -0700)]
am 7d83ef8f: Support custom RenderScript compiler

* commit '7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
  Support custom RenderScript compiler

13 years agoAdded audio effects config file.
Eric Laurent [Wed, 18 May 2011 02:21:55 +0000 (19:21 -0700)]
Added audio effects config file.

A configuration file named audio_effects.conf is now used
to list audio effect libraries and engines to be loaded by the
effects factory. A default version of this file is installed
in /system/etc. OEMs can override this file by placing a file
with the same name under /vendor/etc.

Change-Id: Id10e0e54f53234ec52b22b6f882734edaf2648ac

13 years agoSupport custom RenderScript compiler
Ying Wang [Thu, 26 May 2011 00:16:22 +0000 (17:16 -0700)]
Support custom RenderScript compiler

Change-Id: I85e38e84565e04f99dd26217f280274883dc322d

13 years agoMerge "Add the voicemail provider to the core packages."
Hugo Hudson [Fri, 27 May 2011 18:43:03 +0000 (11:43 -0700)]
Merge "Add the voicemail provider to the core packages."

13 years agoMerge "Remove bluetooth configuration file."
Jaikumar Ganesh [Fri, 27 May 2011 18:38:50 +0000 (11:38 -0700)]
Merge "Remove bluetooth configuration file."

13 years agoam e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based...
Scott Main [Fri, 27 May 2011 17:54:50 +0000 (10:54 -0700)]
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

13 years agoMerge "Added libfilterfw to core.mk."
Marius Renn [Fri, 27 May 2011 17:26:44 +0000 (10:26 -0700)]
Merge "Added libfilterfw to core.mk."

13 years agoam 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether...
Scott Main [Fri, 27 May 2011 17:23:09 +0000 (10:23 -0700)]
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

13 years agoMerge "docs: adjust sdk page to show/hide messages based on whether online or offline...
Scott Main [Fri, 27 May 2011 17:18:14 +0000 (10:18 -0700)]
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

13 years agodocs: adjust sdk page to show/hide messages based on whether online or offline docs
Scott Main [Fri, 27 May 2011 16:52:19 +0000 (09:52 -0700)]
docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08

Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14

13 years agoAdd the voicemail provider to the core packages.
Hugo Hudson [Fri, 27 May 2011 10:54:10 +0000 (11:54 +0100)]
Add the voicemail provider to the core packages.

Change-Id: I6a9f14a1129afffa0f80fb33977a98654ea61ccf

13 years agoBreakup android.core.tests.libcore based on top level package name
Brian Carlstrom [Fri, 27 May 2011 07:04:57 +0000 (00:04 -0700)]
Breakup android.core.tests.libcore based on top level package name

git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b

Change-Id: I685ece362674f83f179ace34367fce88a7f541fb

13 years agoadd sensorservice package to the list
Mathias Agopian [Fri, 27 May 2011 04:53:25 +0000 (21:53 -0700)]
add sensorservice package to the list

Change-Id: I1ab54a7461095f37ea8bdeb480caffafe96a9522

13 years agoAdded libfilterfw to core.mk.
Marius Renn [Fri, 27 May 2011 01:06:55 +0000 (18:06 -0700)]
Added libfilterfw to core.mk.

Change-Id: Idb4c50bec8ae4328849736a7a120343276b45766

13 years agoam 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 23:31:42 +0000 (16:31 -0700)]
am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit '4cd9e2d99090502ced431b7abbff94bcc2176745':
  Support to run dex-preopt on prebuilt apks.

13 years agoam 06e2f72b: Support to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 23:14:32 +0000 (16:14 -0700)]
am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit '06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
  Support to run dex-preopt on prebuilt apks.

13 years agoSupport to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.

Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea

13 years agoFix possible unnecessary rebuild
Ying Wang [Thu, 26 May 2011 20:43:57 +0000 (13:43 -0700)]
Fix possible unnecessary rebuild

This fix the unnecessary rebuild in the following scenario:
A package rename its manifest package name and the old R.java was still
in its intermediate dir. The rule to generate R_file_stamp may always
copy the old R.java with timestamp reserved and the R_file_stamp never
gets updated.

Change-Id: I659cbb00f0e7734d7d71e1ca66065f587c8dee2c

13 years agoRemove bluetooth configuration file.
Jaikumar Ganesh [Thu, 26 May 2011 18:10:31 +0000 (11:10 -0700)]
Remove bluetooth configuration file.

This now needs to be controlled on a per product basis
rather than telephony / no telephony basis.

Change-Id: I581bc0e027f844c1f7b7262c3833d8f727c3c9ec

13 years agoMerge "x86: Enable -fstack-protector"
David Turner [Thu, 26 May 2011 16:21:35 +0000 (09:21 -0700)]
Merge "x86: Enable -fstack-protector"

13 years agox86: Enable -fstack-protector
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>
13 years agoMerge "Clean up of X86 build flags"
David Turner [Wed, 25 May 2011 05:58:20 +0000 (22:58 -0700)]
Merge "Clean up of X86 build flags"

13 years agoMerge "Fix use of intermediates in droiddoc"
Ying Wang [Tue, 24 May 2011 23:27:29 +0000 (16:27 -0700)]
Merge "Fix use of intermediates in droiddoc"

13 years agoReconcile with gingerbread-release honeycomb-release honeycomb-mr1-release honeycomb...
The Android Open Source Project [Fri, 20 May 2011 21:23:31 +0000 (14:23 -0700)]
Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release honeycomb-mr2-release honeycomb-LTE-release

Change-Id: Ieee6a3fece693ded9f20f8c94f1dcf2cc672072b

13 years agoMerge "Switch to mksh as the default shell."
Jean-Baptiste Queru [Fri, 20 May 2011 17:59:47 +0000 (10:59 -0700)]
Merge "Switch to mksh as the default shell."

13 years agoHTJ50
The Android Automerger [Fri, 20 May 2011 14:09:02 +0000 (07:09 -0700)]
HTJ50

Change-Id: I3db4ee9078094fe2ca1bdcee52b7c34e4efb8d85

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 20 May 2011 14:08:58 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ50
The Android Automerger [Fri, 20 May 2011 13:09:45 +0000 (06:09 -0700)]
HLJ50

Change-Id: If575aa28cb80a3490a49d9e22222eb8eb3e62ae5

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 20 May 2011 13:09:40 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoam cdef4045: (-s ours) Merge 5d66a07d - do not merge
Jean-Baptiste Queru [Thu, 19 May 2011 22:17:21 +0000 (15:17 -0700)]
am cdef4045: (-s ours) Merge 5d66a07d - do not merge

* commit 'cdef404572a71ea320f59643c52143764bd590fe':
  Use actual numbers in version numbers.

13 years agoMerge 5d66a07d - do not merge
Jean-Baptiste Queru [Thu, 19 May 2011 21:30:26 +0000 (14:30 -0700)]
Merge 5d66a07d - do not merge

Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4

13 years agoMerge "Use actual numbers in version numbers."
Jean-Baptiste Queru [Thu, 19 May 2011 20:57:00 +0000 (13:57 -0700)]
Merge "Use actual numbers in version numbers."

13 years agoHTJ49
The Android Automerger [Thu, 19 May 2011 14:08:43 +0000 (07:08 -0700)]
HTJ49

Change-Id: I1178be6de8832ff8febc6e466f4b4b3a92d487da

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 19 May 2011 14:08:38 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ49
The Android Automerger [Thu, 19 May 2011 13:08:38 +0000 (06:08 -0700)]
HLJ49

Change-Id: I718a1b761026950ac1712f18f39c4d219e1d20e0

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 19 May 2011 13:08:33 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoClean up of X86 build flags
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>

13 years agoSwitch to mksh as the default shell.
Jean-Baptiste Queru [Wed, 18 May 2011 20:49:08 +0000 (13:49 -0700)]
Switch to mksh as the default shell.

Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.

Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc

13 years agoHTJ48
The Android Automerger [Wed, 18 May 2011 14:09:16 +0000 (07:09 -0700)]
HTJ48

Change-Id: I1f032567bfd8c8e07c39cfd3be7ea296076903b6

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 18 May 2011 14:09:12 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ48
The Android Automerger [Wed, 18 May 2011 13:09:56 +0000 (06:09 -0700)]
HLJ48

Change-Id: Id99ec7468fec0cdfb83037ae04402171095cd7ea

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 18 May 2011 13:09:49 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoFix use of intermediates in droiddoc
Ying Wang [Tue, 17 May 2011 21:48:10 +0000 (14:48 -0700)]
Fix use of intermediates in droiddoc

Droiddoc should be product-independent.

Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c

13 years agoHTJ47
The Android Automerger [Tue, 17 May 2011 14:08:46 +0000 (07:08 -0700)]
HTJ47

Change-Id: I6ff5d200c839b8478f0f68e80d5a9e153356be9b

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 17 May 2011 14:08:42 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ47
The Android Automerger [Tue, 17 May 2011 13:08:32 +0000 (06:08 -0700)]
HLJ47

Change-Id: I4d30bf58dbb6f753d55ea0b79177870832951d82

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 17 May 2011 13:08:27 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoMerge "adding TF dependency to vm-tf, since now we are using cts-tf things."
Tsu Chiang Chuang [Mon, 16 May 2011 23:10:43 +0000 (16:10 -0700)]
Merge "adding TF dependency to vm-tf, since now we are using cts-tf things."

13 years agoadding TF dependency to vm-tf, since now we are using cts-tf things.
Tsu Chiang Chuang [Sun, 15 May 2011 19:03:27 +0000 (12:03 -0700)]
adding TF dependency to vm-tf, since now we are using cts-tf things.

Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741

13 years agoam c9395fc3: am 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles...
Scott Main [Mon, 16 May 2011 19:25:17 +0000 (12:25 -0700)]
am c9395fc3: am 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap

* commit 'c9395fc341fda71d95e622668545990fe94cdd5c':
  docs: make featured video titles smaller so they don't line wrap

13 years agoam 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles smaller so...
Scott Main [Mon, 16 May 2011 19:22:27 +0000 (12:22 -0700)]
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

13 years agoam 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t...
Scott Main [Mon, 16 May 2011 19:19:13 +0000 (12:19 -0700)]
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

13 years agoam faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
Scott Main [Mon, 16 May 2011 19:17:20 +0000 (12:17 -0700)]
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

13 years agodocs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:12:58 +0000 (12:12 -0700)]
docs: make featured video titles smaller so they don't line wrap

Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2

13 years agoAdd stagefright software decoders to core.mk
Andreas Huber [Mon, 16 May 2011 16:42:49 +0000 (09:42 -0700)]
Add stagefright software decoders to core.mk

Change-Id: I9ecb8bbf179607bcdcb37db43cc11248201ea41f
related-to-bug: 4427361

13 years agoHTJ46
The Android Automerger [Mon, 16 May 2011 14:11:03 +0000 (07:11 -0700)]
HTJ46

Change-Id: I0c3df08c5264a4bf80edb4c35e309ac2d8a7a7e1

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 16 May 2011 14:10:58 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ46
The Android Automerger [Mon, 16 May 2011 13:00:48 +0000 (06:00 -0700)]
HLJ46

Change-Id: Ia6f600e2d0741d23b9cc1be1cf159430041f69e8

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 16 May 2011 13:00:42 +0000 (06:00 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ45
The Android Automerger [Mon, 16 May 2011 03:12:55 +0000 (20:12 -0700)]
HLJ45

Change-Id: Ib4f53560a6c81ca44203207e7fbe18e0808e878f

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 16 May 2011 03:12:50 +0000 (20:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ43B
The Android Automerger [Sat, 14 May 2011 05:14:29 +0000 (22:14 -0700)]
HLJ43B

Change-Id: Idc37d0305218505100025ff19dd6fb4c6254e684

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 14 May 2011 05:14:23 +0000 (22:14 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoGRJ43
The Android Automerger [Fri, 13 May 2011 21:27:49 +0000 (14:27 -0700)]
GRJ43

Change-Id: I17c44f6b0635c30509d8c91e16ee6dcfc6f12a6f

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 13 May 2011 21:27:38 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agoHTJ43
The Android Automerger [Fri, 13 May 2011 14:08:24 +0000 (07:08 -0700)]
HTJ43

Change-Id: I05fe223f0d9058eacfc2c5b05c5701e3413a96fa

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 13 May 2011 14:08:20 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ43
The Android Automerger [Fri, 13 May 2011 13:07:57 +0000 (06:07 -0700)]
HLJ43

Change-Id: Ie16a7790fe0b2f3cf02651b498318a73e50fbb09

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 13 May 2011 13:07:50 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ42B
The Android Automerger [Thu, 12 May 2011 22:19:48 +0000 (15:19 -0700)]
HLJ42B

Change-Id: I638a7e308855b67b39820c1e91da2ce22a468a92

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 12 May 2011 22:19:43 +0000 (15:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoMerge "Cleanspec for change 109590"
Andreas Huber [Thu, 12 May 2011 16:29:27 +0000 (09:29 -0700)]
Merge "Cleanspec for change 109590"

13 years agoam bdb72318: am 5372220a: Merge "Remove simulator from the lunch menu"
Jean-Baptiste Queru [Thu, 12 May 2011 16:01:31 +0000 (09:01 -0700)]
am bdb72318: am 5372220a: Merge "Remove simulator from the lunch menu"

* commit 'bdb72318e47d38df2180bd00d0fd0a97bdc82255':
  Remove simulator from the lunch menu

13 years agoam 5372220a: Merge "Remove simulator from the lunch menu"
Jean-Baptiste Queru [Thu, 12 May 2011 15:52:59 +0000 (08:52 -0700)]
am 5372220a: Merge "Remove simulator from the lunch menu"

* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu

13 years agoMerge "Remove simulator from the lunch menu"
Jean-Baptiste Queru [Thu, 12 May 2011 15:04:50 +0000 (08:04 -0700)]
Merge "Remove simulator from the lunch menu"

13 years agoHTJ42
The Android Automerger [Thu, 12 May 2011 14:08:03 +0000 (07:08 -0700)]
HTJ42

Change-Id: I774abd20009d2b0ff5dd2a50eb6549d1f4ca2d9b

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 12 May 2011 14:07:59 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoHLJ42
The Android Automerger [Thu, 12 May 2011 13:07:57 +0000 (06:07 -0700)]
HLJ42

Change-Id: I484952f2d0dd5ac33136232473eb39cc52d5c47d

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 12 May 2011 13:07:52 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoam 477e9632: (-s ours) am ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch...
Dianne Hackborn [Wed, 11 May 2011 22:13:18 +0000 (15:13 -0700)]
am 477e9632: (-s ours) am ea4d9f55: am 22b5d621: DO NOT MERGE.  We are now dev branch for Honeycomb MR2.

* commit '477e963276a1fb3759cbf40fc4ea1039b0d22057':
  DO NOT MERGE.  We are now dev branch for Honeycomb MR2.

13 years agoCleanspec for change 109590
Andreas Huber [Wed, 11 May 2011 21:39:02 +0000 (14:39 -0700)]
Cleanspec for change 109590

Change-Id: Icd4a6c3963d33b813e212015d954e9f06a489a05

13 years agoam ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Dianne Hackborn [Wed, 11 May 2011 20:49:50 +0000 (13:49 -0700)]
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.