git.osdn.net Git - android-x86/build.git/log

Ying Wang [Wed, 8 Aug 2012 22:42:06 +0000 (15:42 -0700)]

am e1770f5f: am 9c649a75: Don\'t install overridden packages in pdk fusion files.

* commit 'e1770f5fc85eccc7124cd2effb634baa308851eb':
Don't install overridden packages in pdk fusion files.

commit | commitdiff | tree

Ying Wang [Wed, 8 Aug 2012 22:40:21 +0000 (15:40 -0700)]

am 9c649a75: Don\'t install overridden packages in pdk fusion files.

* commit '9c649a7542ee3fda57a1836ad0ddcd8d19921f5b':
Don't install overridden packages in pdk fusion files.

commit | commitdiff | tree

Ying Wang [Wed, 8 Aug 2012 22:27:00 +0000 (15:27 -0700)]

Don't install overridden packages in pdk fusion files.

Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 22:11:25 +0000 (15:11 -0700)]

am f5bbfe82: am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit 'f5bbfe825afdbcb6e88df19ef6535b23ea5589e7':
x86: cleanups for toolchain

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 22:11:07 +0000 (15:11 -0700)]

am 61c4a50e: am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit '61c4a50edb2b75a05a9804421a3138fb9c822598':
definitions.mk: Don't use GCC '@' parameter

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 21:09:09 +0000 (14:09 -0700)]

am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit 'b0cc9aae50089f0b77d6adc74f4d6027f0316b52':
x86: cleanups for toolchain

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 21:06:28 +0000 (14:06 -0700)]

am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d':
x86: cleanups for toolchain

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:17 +0000 (14:04 -0700)]

am 8776f34a: Merge "x86: cleanups for toolchain"

* commit '8776f34aaad8394caf58b864a41765b7ced52a65':
x86: cleanups for toolchain

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]

Merge "x86: cleanups for toolchain"

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:28:54 +0000 (13:28 -0700)]

am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit '1870b7f4f26f5c1d32e767dad7a05c69e1679a3d':
definitions.mk: Don't use GCC '@' parameter

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:26:40 +0000 (13:26 -0700)]

am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit 'a4814370724634c0ee0bf35bc68f382f0df93668':
definitions.mk: Don't use GCC '@' parameter

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:24:44 +0000 (13:24 -0700)]

am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit '4733cfd2de0bed2dfdf4c32517b0c59762c85b2e':
definitions.mk: Don't use GCC '@' parameter

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:18:56 +0000 (13:18 -0700)]

Merge "definitions.mk: Don't use GCC '@' parameter"

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:21 +0000 (13:11 -0700)]

am 98092627: am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit '98092627cd9731ea09cbf225880e5c48dc6f564e':
core/Makefile: also look for device/*/build/tasks

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:10:06 +0000 (13:10 -0700)]

am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit '7de61d1471cd8938ade62ae439cad11ea141cf40':
core/Makefile: also look for device/*/build/tasks

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:07:59 +0000 (13:07 -0700)]

am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
core/Makefile: also look for device/*/build/tasks

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 20:06:25 +0000 (13:06 -0700)]

am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit 'af541a64abd16f6a33146a833dce71e739b722c8':
core/Makefile: also look for device/*/build/tasks

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]

Merge "core/Makefile: also look for device/*/build/tasks"

commit | commitdiff | tree

Scott Main [Wed, 8 Aug 2012 19:54:29 +0000 (12:54 -0700)]

am 4587a9c2: am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width

* commit '4587a9c2d49e7695eee7bccdbfad56b45c116a0d':
docs: make landing pages w/o image span the full page width

commit | commitdiff | tree

Scott Main [Wed, 8 Aug 2012 19:53:14 +0000 (12:53 -0700)]

am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width

* commit '0207498d6e1933244c287eed7737c0518d7d8a26':
docs: make landing pages w/o image span the full page width

commit | commitdiff | tree

Scott Main [Wed, 8 Aug 2012 19:50:59 +0000 (12:50 -0700)]

am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width

* commit 'c8b7dfb1e308d7dbe426724d21b932b8b79d9ab5':
docs: make landing pages w/o image span the full page width

commit | commitdiff | tree

Scott Main [Wed, 8 Aug 2012 19:48:58 +0000 (12:48 -0700)]

am 0e71cee2: docs: make landing pages w/o image span the full page width

* commit '0e71cee2bbe5aac3a5e502936cac46b830af0067':
docs: make landing pages w/o image span the full page width

commit | commitdiff | tree

Elliott Hughes [Wed, 8 Aug 2012 18:00:39 +0000 (11:00 -0700)]

Remove libastl and libastl_host from the grandfathered list.

astl is dead.

Change-Id: I123d1de9da23576c76772a6c9b73046aa0d189ef

commit | commitdiff | tree

Elliott Hughes [Wed, 8 Aug 2012 16:49:15 +0000 (09:49 -0700)]

Merge "Remove the obsolete bin2asm tool."

commit | commitdiff | tree

Elliott Hughes [Wed, 8 Aug 2012 16:44:05 +0000 (09:44 -0700)]

Remove the obsolete bin2asm tool.

We haven't used this to assemble the ICU data into a .o file since
like Eclair.

Change-Id: I34d903aa1be31244c63f7d60afa90df9a3e6c21e

commit | commitdiff | tree

The Android Open Source Project [Wed, 8 Aug 2012 15:17:13 +0000 (08:17 -0700)]

am 094c637b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '094c637b0450729fa2b20a4f63768f83daa0ac0e':
JOO39
JOO38B

commit | commitdiff | tree

The Android Open Source Project [Wed, 8 Aug 2012 15:15:40 +0000 (08:15 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I51e7a05d068725eb54c9cc38ab770707f7082c62

commit | commitdiff | tree

The Android Automerger [Wed, 8 Aug 2012 13:48:58 +0000 (06:48 -0700)]

commit | commitdiff | tree

The Android Automerger [Wed, 8 Aug 2012 13:33:28 +0000 (06:33 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 22:22:48 +0000 (15:22 -0700)]

am 8d950f84: (-s ours) am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '8d950f8424bd5f48ce51b09b915964ec109bef55':
JZO38

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 22:16:15 +0000 (15:16 -0700)]

am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '6bdeb4481e3e447d5234426a6c9cc74cbf103bab':
JZO38

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 22:14:08 +0000 (15:14 -0700)]

am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee':
JZO38

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 21:58:18 +0000 (14:58 -0700)]

Reconcile with jb-mr0-release - do not merge

Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 20:59:43 +0000 (13:59 -0700)]

docs: make landing pages w/o image span the full page width

Change-Id: I96af0c7e1443079820c44b589b0c3ef638ae9c86

commit | commitdiff | tree

The Android Automerger [Tue, 7 Aug 2012 20:02:14 +0000 (13:02 -0700)]

commit | commitdiff | tree

The Android Automerger [Tue, 7 Aug 2012 20:00:36 +0000 (13:00 -0700)]

merge in jb-mr0-release history after reset to jb-dev

commit | commitdiff | tree

The Android Automerger [Tue, 7 Aug 2012 18:12:57 +0000 (11:12 -0700)]

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 18:04:09 +0000 (11:04 -0700)]

am 84d8513a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '84d8513a5c45fbafce3a2da3a51a438420cea85d':
JOO38

commit | commitdiff | tree

The Android Open Source Project [Tue, 7 Aug 2012 18:02:36 +0000 (11:02 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc

commit | commitdiff | tree

The Android Automerger [Tue, 7 Aug 2012 13:36:03 +0000 (06:36 -0700)]

commit | commitdiff | tree

The Android Automerger [Tue, 7 Aug 2012 13:33:35 +0000 (06:33 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 02:01:42 +0000 (19:01 -0700)]

am cbe053ce: am aad5e32f: am fe50d923: am 9332a459: docs: comment-out unused style (the png currently does not resolve)

* commit 'cbe053ce2a930384d8c2dc8dc7b150922d986026':
docs: comment-out unused style (the png currently does not resolve)

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 02:00:09 +0000 (19:00 -0700)]

am aad5e32f: am fe50d923: am 9332a459: docs: comment-out unused style (the png currently does not resolve)

* commit 'aad5e32f6ac517d24fa01b74172cec8085f19bda':
docs: comment-out unused style (the png currently does not resolve)

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 01:58:36 +0000 (18:58 -0700)]

am fe50d923: am 9332a459: docs: comment-out unused style (the png currently does not resolve)

* commit 'fe50d92396f00e07bc77be1e95ffb5c8b0c989bd':
docs: comment-out unused style (the png currently does not resolve)

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 01:56:45 +0000 (18:56 -0700)]

am 9332a459: docs: comment-out unused style (the png currently does not resolve)

* commit '9332a459186e467aba6b3b9b8c16e0fd3dc84860':
docs: comment-out unused style (the png currently does not resolve)

commit | commitdiff | tree

Scott Main [Tue, 7 Aug 2012 01:54:18 +0000 (18:54 -0700)]

docs: comment-out unused style (the png currently does not resolve)

Change-Id: I665068f0808a81c98cbd0685f68ed7f4df4cf0e0

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:57:55 +0000 (13:57 -0700)]

am 8fc78f4d: (-s ours) am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge

* commit '8fc78f4d63d209d3d6e329b21aab876dd2c6977c':
JRO03O

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:56:37 +0000 (13:56 -0700)]

am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge

* commit '8e3bf38977e2b46db4191d417568fe1c78efac14':
JRO03O

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:51:47 +0000 (13:51 -0700)]

am 1210541b: (-s ours) Reconcile with jb-release - do not merge

* commit '1210541bfd9a3359cec9c00c42caaa74d2a65f5a':
JRO03O

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:49:54 +0000 (13:49 -0700)]

Reconcile with jb-release - do not merge

Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:35:36 +0000 (13:35 -0700)]

am aef6938a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'aef6938a920f9f1bb56ccd464995798d43b5d8c1':
JOO37B

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:34:24 +0000 (13:34 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I94c2ae5ee6239ab6d058d0afabf896780bbbe838

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:19:44 +0000 (13:19 -0700)]

am 15c12af8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '15c12af81f6055858f4b0edbd6c0c903286108c6':
JOO37
JOO33C

commit | commitdiff | tree

The Android Open Source Project [Mon, 6 Aug 2012 20:17:57 +0000 (13:17 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I78f2650f276afe5ec7b3c81baa7957b526de2569

commit | commitdiff | tree

The Android Automerger [Mon, 6 Aug 2012 20:06:02 +0000 (13:06 -0700)]

commit | commitdiff | tree

The Android Automerger [Mon, 6 Aug 2012 19:32:03 +0000 (12:32 -0700)]

commit | commitdiff | tree

The Android Automerger [Mon, 6 Aug 2012 13:30:31 +0000 (06:30 -0700)]

commit | commitdiff | tree

The Android Automerger [Mon, 6 Aug 2012 13:27:33 +0000 (06:27 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Ying Wang [Sat, 4 Aug 2012 00:50:53 +0000 (17:50 -0700)]

am 5da8a5ff: am 7f9db64d: Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev

* commit '5da8a5ffa2c06ba0cf598bcc13feda950990f6e5':
Add libstagefright and libstagefright_chromium_http to core.mk.

commit | commitdiff | tree

Ying Wang [Sat, 4 Aug 2012 00:48:49 +0000 (17:48 -0700)]

am 7f9db64d: Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev

* commit '7f9db64d0eaf69b362dd7bcdf9a0ce30562efe29':
Add libstagefright and libstagefright_chromium_http to core.mk.

commit | commitdiff | tree

Ying Wang [Sat, 4 Aug 2012 00:46:48 +0000 (17:46 -0700)]

Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev

commit | commitdiff | tree

Ying Wang [Sat, 4 Aug 2012 00:43:00 +0000 (17:43 -0700)]

Add libstagefright and libstagefright_chromium_http to core.mk.

Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812

commit | commitdiff | tree

The Android Automerger [Fri, 3 Aug 2012 22:01:00 +0000 (15:01 -0700)]

commit | commitdiff | tree

Paul Westbrook [Fri, 3 Aug 2012 21:24:40 +0000 (14:24 -0700)]

am d911880b: am acf206bc: Merge "Add imap2 to the build" into jb-mr1-dev

* commit 'd911880b25f2b3c55c05de54fe498eb6e24a0411':
Add imap2 to the build

commit | commitdiff | tree

Paul Westbrook [Fri, 3 Aug 2012 21:22:49 +0000 (14:22 -0700)]

am acf206bc: Merge "Add imap2 to the build" into jb-mr1-dev

* commit 'acf206bc5eb78b432d19b3f200d9d6e3ff8e4361':
Add imap2 to the build

commit | commitdiff | tree

Paul Westbrook [Fri, 3 Aug 2012 21:21:56 +0000 (14:21 -0700)]

Merge "Add imap2 to the build" into jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:58:05 +0000 (13:58 -0700)]

am fa384c7f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fa384c7f751ba9320c65ce9a62fbe3007bca3315':
  JOO33B take two
  add extra args to mkbootimg
  JOO33B
  JOO33 take two

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:56:03 +0000 (13:56 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Id99c83537b1e0ddbfb2f2b8b2b0cfc131df12fe4

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:28:34 +0000 (13:28 -0700)]

am b78b24e1: (-s ours) am fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'b78b24e1bf8a1195fd038c874561db80ea2214c5':
  JRO03L
  JRO03K
  JRO03J
  JRO03I

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:26:49 +0000 (13:26 -0700)]

am fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'fa3c2d9a766202c026e2856ec9111b69a06c6f4c':
  JRO03L
  JRO03K
  JRO03J
  JRO03I

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:25:06 +0000 (13:25 -0700)]

am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'ad808f5da422b13489edb04b38daf871e5f977a6':
  JRO03L
  JRO03K
  JRO03J
  JRO03I

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 20:23:06 +0000 (13:23 -0700)]

Reconcile with jb-release - do not merge

Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a

commit | commitdiff | tree

The Android Open Source Project [Fri, 3 Aug 2012 19:11:39 +0000 (12:11 -0700)]

Reconcile AOSP and GOOG jb-release

Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611

commit | commitdiff | tree

Paul Westbrook [Fri, 3 Aug 2012 18:46:02 +0000 (11:46 -0700)]

Add imap2 to the build

Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99

commit | commitdiff | tree

The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]

commit | commitdiff | tree

The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]

commit | commitdiff | tree

The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]

JRO03J

Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43

commit | commitdiff | tree

The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]

commit | commitdiff | tree

The Android Automerger [Fri, 3 Aug 2012 14:37:30 +0000 (07:37 -0700)]

commit | commitdiff | tree

Shih-wei Liao [Fri, 3 Aug 2012 12:38:14 +0000 (05:38 -0700)]

am c91bb757: am c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported.

* commit 'c91bb757eee86f20e2c8e0ae89d1995e647be1b8':
Fix build: After merging in Clang, -Wno-psabi is no longer supported.

commit | commitdiff | tree

Shih-wei Liao [Fri, 3 Aug 2012 12:36:16 +0000 (05:36 -0700)]

am c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported.

* commit 'c814bcefd7ff65cbc91b66fb67a038fbd6ec9944':
Fix build: After merging in Clang, -Wno-psabi is no longer supported.

commit | commitdiff | tree

Shih-wei Liao [Fri, 3 Aug 2012 12:17:23 +0000 (05:17 -0700)]

Fix build: After merging in Clang, -Wno-psabi is no longer supported.

-Wno-unused-but-set-variable is not supported either.

Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086

commit | commitdiff | tree

Doug Zongker [Thu, 2 Aug 2012 21:46:42 +0000 (14:46 -0700)]

add extra args to mkbootimg

Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.

Bug: 6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1

commit | commitdiff | tree

The Android Automerger [Fri, 3 Aug 2012 02:03:27 +0000 (19:03 -0700)]

commit | commitdiff | tree

Doug Zongker [Thu, 2 Aug 2012 22:17:15 +0000 (15:17 -0700)]

am 42caec28: am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev

* commit '42caec28ab1393853c342a989ec844846235013f':
add extra args to mkbootimg

commit | commitdiff | tree

Keun young Park [Thu, 2 Aug 2012 22:09:30 +0000 (15:09 -0700)]

am 0eeeab73: am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

* commit '0eeeab736e3047cec89d69d2e3f034bef83bbc60':
keep PLATFORM_ZIP specified explicitly

commit | commitdiff | tree

The Android Open Source Project [Thu, 2 Aug 2012 22:08:59 +0000 (15:08 -0700)]

am f6b165e0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f6b165e0232c315d91c3ba2c394da27234012fd9':
  JOO33
  JOO32C
  JOO33

commit | commitdiff | tree

Doug Zongker [Thu, 2 Aug 2012 22:07:50 +0000 (15:07 -0700)]

am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev

* commit '1e845d33af68673f0a6712c9c22dc2c37eebbc9d':
add extra args to mkbootimg

commit | commitdiff | tree

Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]

Merge "add extra args to mkbootimg" into jb-mr1-dev

commit | commitdiff | tree

Doug Zongker [Thu, 2 Aug 2012 21:46:42 +0000 (14:46 -0700)]

commit | commitdiff | tree

Keun young Park [Thu, 2 Aug 2012 21:56:37 +0000 (14:56 -0700)]

am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

* commit '15b2b0f711a824f4e4e8b72584b1fb8d19b3f123':
keep PLATFORM_ZIP specified explicitly

commit | commitdiff | tree

Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]

Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 20:00:44 +0000 (13:00 -0700)]

commit | commitdiff | tree

Keun young Park [Thu, 2 Aug 2012 19:51:59 +0000 (12:51 -0700)]

keep PLATFORM_ZIP specified explicitly

- the old behaviour was to override with default one, which makes
trying different sets of platform.zip difficult if default one exists

Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4

commit | commitdiff | tree

The Android Open Source Project [Thu, 2 Aug 2012 18:26:09 +0000 (11:26 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: If85f28cdbccda3f78297d611fb01a38ee310e208

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 15:18:45 +0000 (08:18 -0700)]

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 15:18:08 +0000 (08:18 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 14:06:08 +0000 (07:06 -0700)]

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 14:00:53 +0000 (07:00 -0700)]

commit | commitdiff | tree

The Android Automerger [Thu, 2 Aug 2012 14:00:32 +0000 (07:00 -0700)]