OSDN Git Service

android-x86/build.git
11 years agoReconcile with jb-mr1-release - do not merge
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

11 years agoam fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge
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

11 years agoam ad808f5d: (-s ours) Reconcile with jb-release - do not merge
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

11 years agoReconcile with jb-release - do not merge
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

11 years agoReconcile AOSP and GOOG jb-release
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

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

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

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

Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43

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

11 years agoJOO33B take two
The Android Automerger [Fri, 3 Aug 2012 14:37:30 +0000 (07:37 -0700)]
JOO33B take two

11 years agoam c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported.
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.

11 years agoFix build: After merging in Clang, -Wno-psabi is no longer supported.
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

11 years agoadd extra args to mkbootimg
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

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

11 years agoam 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev
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

11 years agoMerge "add extra args to mkbootimg" into jb-mr1-dev
Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]
Merge "add extra args to mkbootimg" into jb-mr1-dev

11 years agoadd extra args to mkbootimg
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

11 years agoam 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
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

11 years agoMerge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

11 years agoJOO33 take two
The Android Automerger [Thu, 2 Aug 2012 20:00:44 +0000 (13:00 -0700)]
JOO33 take two

11 years agokeep PLATFORM_ZIP specified explicitly
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

11 years agoReconcile with jb-mr1-release - do not merge
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

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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

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

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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 14:00:32 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:40:44 +0000 (15:40 -0700)]
am cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev

* commit 'cdbf0292e435b46c764c19cba956b5f2e0d70751':
  add missing telephony libs for PDK mini config

11 years agoMerge "add missing telephony libs for PDK mini config" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:39:11 +0000 (15:39 -0700)]
Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 1 Aug 2012 22:13:27 +0000 (15:13 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I80d33df61bb9c1f1293c71d1d01a1e510e2ce693

11 years agoadd missing telephony libs for PDK mini config
Keun young Park [Wed, 1 Aug 2012 22:02:35 +0000 (15:02 -0700)]
add missing telephony libs for PDK mini config

Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99

11 years agoam f5bd3bce: am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c...
Roman Nurik [Wed, 1 Aug 2012 21:52:39 +0000 (14:52 -0700)]
am f5bd3bce: am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev

* commit 'f5bd3bce6706a8662827e037337fb84608d9b67f':
  Improve print stylesheet for d.a.c.

11 years agoam fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 21:49:45 +0000 (14:49 -0700)]
am fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev

* commit 'fad81e8997ad73d805f903a656347bcc863b69f5':
  add symbol files to PDK release for debugging

11 years agoam 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 21:48:36 +0000 (14:48 -0700)]
am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev

* commit '2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
  Improve print stylesheet for d.a.c.

11 years agoMerge "add symbol files to PDK release for debugging" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 20:08:55 +0000 (13:08 -0700)]
Merge "add symbol files to PDK release for debugging" into jb-mr1-dev

11 years agoadd symbol files to PDK release for debugging
Keun young Park [Wed, 1 Aug 2012 00:13:20 +0000 (17:13 -0700)]
add symbol files to PDK release for debugging

- app_process is not in PDK, and this makes native debugging difficult
  So provide symbol file instead of source

Bug: 6774048

Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b

11 years agoam c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 19:41:10 +0000 (12:41 -0700)]
am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev

* commit 'c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
  Improve print stylesheet for d.a.c.

11 years agoMerge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Merge "Improve print stylesheet for d.a.c." into jb-dev

11 years agoImprove print stylesheet for d.a.c.
Roman Nurik [Wed, 1 Aug 2012 17:37:40 +0000 (10:37 -0700)]
Improve print stylesheet for d.a.c.

- Improve printed page margins
- Hide navigational elements
- Print link URLs
- Improve spacing on key elements

Change-Id: Ic487e00636b1d06f15d7a29b4162c9e31f5569b1

11 years agoam 72972445: am b736e07c: am 2ccbd3f8: change "nolist" style to be simply remove...
Scott Main [Wed, 1 Aug 2012 19:16:34 +0000 (12:16 -0700)]
am 72972445: am b736e07c: am 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.

* commit '72972445f24edd218db45df51045091455b63b7a':
  change "nolist" style to be simply remove bullets and indent; leave the rest alone.

11 years agoam b736e07c: am 2ccbd3f8: change "nolist" style to be simply remove bullets and inden...
Scott Main [Wed, 1 Aug 2012 19:15:24 +0000 (12:15 -0700)]
am b736e07c: am 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.

* commit 'b736e07cbb9b0b3c0ccdc6352a10b36d244aebbc':
  change "nolist" style to be simply remove bullets and indent; leave the rest alone.

11 years agoam 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave...
Scott Main [Wed, 1 Aug 2012 19:12:51 +0000 (12:12 -0700)]
am 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.

* commit '2ccbd3f8d44bbc9b7a542144751767fe093083e7':
  change "nolist" style to be simply remove bullets and indent; leave the rest alone.

11 years agochange "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:05:12 +0000 (12:05 -0700)]
change "nolist" style to be simply remove bullets and indent; leave the rest alone.

Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a

11 years agoJOO32
The Android Automerger [Wed, 1 Aug 2012 14:18:49 +0000 (07:18 -0700)]
JOO32

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 1 Aug 2012 14:18:30 +0000 (07:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 22:02:29 +0000 (15:02 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I2c181ef0dd06df0086bd941ccf69b5c6aca437d0

11 years agoam 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do...
The Android Open Source Project [Tue, 31 Jul 2012 21:51:16 +0000 (14:51 -0700)]
am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '2a5f755a794b2ce4d4027804bcb1af6ece714933':
  JZO31
  JRO03N
  JRO03M

11 years agoam 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 21:49:13 +0000 (14:49 -0700)]
am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '8665eb732364b31506719dcce99237e13cc87866':
  JZO31
  JRO03N
  JRO03M

11 years agoReconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95

11 years agoJZO31
The Android Automerger [Tue, 31 Jul 2012 21:08:19 +0000 (14:08 -0700)]
JZO31

11 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 31 Jul 2012 21:07:00 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev

11 years agoJOO31B
The Android Automerger [Tue, 31 Jul 2012 20:09:31 +0000 (13:09 -0700)]
JOO31B

11 years agoam ff8d3674: am 37132103: am a8d7485d: Merge "add script to create links on topic...
Scott Main [Tue, 31 Jul 2012 19:49:13 +0000 (12:49 -0700)]
am ff8d3674: am 37132103: am a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev

* commit 'ff8d3674abc99c0c45543ade969aec803a71177a':
  add script to create links on topic landing page for first doc that use the doc's title

11 years agoam 37132103: am a8d7485d: Merge "add script to create links on topic landing page...
Scott Main [Tue, 31 Jul 2012 19:47:42 +0000 (12:47 -0700)]
am 37132103: am a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev

* commit '37132103a2d60c7ceb0ede1f34d8b3c633d7c09e':
  add script to create links on topic landing page for first doc that use the doc's title

11 years agoam a8d7485d: Merge "add script to create links on topic landing page for first doc...
Scott Main [Tue, 31 Jul 2012 19:45:28 +0000 (12:45 -0700)]
am a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev

* commit 'a8d7485de2d43e2c9c77ed62638174742bc66d1f':
  add script to create links on topic landing page for first doc that use the doc's title

11 years agoMerge "add script to create links on topic landing page for first doc that use the...
Scott Main [Tue, 31 Jul 2012 19:43:28 +0000 (12:43 -0700)]
Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev

11 years agoJRO03N
The Android Automerger [Tue, 31 Jul 2012 15:18:14 +0000 (08:18 -0700)]
JRO03N

11 years agoSync with jb-mr1-dev
The Android Open Source Project [Tue, 31 Jul 2012 14:51:15 +0000 (07:51 -0700)]
Sync with jb-mr1-dev

Change-Id: I31e76b5a358c14d5194eaf02b08a728d1ca9b4c5

11 years agoJOO31
The Android Automerger [Tue, 31 Jul 2012 14:35:49 +0000 (07:35 -0700)]
JOO31

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 31 Jul 2012 14:35:14 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoThis branch is now JB MR1 development.
Dianne Hackborn [Tue, 31 Jul 2012 00:38:04 +0000 (17:38 -0700)]
This branch is now JB MR1 development.

Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9

11 years agoadd script to create links on topic landing page for first doc that use the doc's...
Scott Main [Fri, 27 Jul 2012 01:00:14 +0000 (18:00 -0700)]
add script to create links on topic landing page for first doc that use the doc's title

Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8

11 years agoJRO03M
The Android Automerger [Mon, 30 Jul 2012 22:51:31 +0000 (15:51 -0700)]
JRO03M

11 years agoReconcile with jb-mr1-release
The Android Open Source Project [Mon, 30 Jul 2012 22:03:25 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release

Change-Id: I8a58307dd78dc6fa26d197408853e4f717b5bae9

11 years agoJOO30B
The Android Automerger [Mon, 30 Jul 2012 16:46:30 +0000 (09:46 -0700)]
JOO30B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOO30
The Android Automerger [Mon, 30 Jul 2012 14:15:33 +0000 (07:15 -0700)]
JOO30

11 years agoam 68bd94e2: am 3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
Ed Heyl [Mon, 30 Jul 2012 05:37:03 +0000 (22:37 -0700)]
am 68bd94e2: am 3d71b0c7: Merge "Add new vendors" into jb-mr1-dev

* commit '68bd94e288985af0de983950e6fb98bfea62f19f':
  Add new vendors

11 years agoam 3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
Ed Heyl [Mon, 30 Jul 2012 05:33:18 +0000 (22:33 -0700)]
am 3d71b0c7: Merge "Add new vendors" into jb-mr1-dev

* commit '3d71b0c7e2c28008ba9658df0138008d66bd5d4a':
  Add new vendors

11 years agoMerge "Add new vendors" into jb-mr1-dev
Ed Heyl [Sun, 29 Jul 2012 23:35:27 +0000 (16:35 -0700)]
Merge "Add new vendors" into jb-mr1-dev

11 years agoam 06f20f02: am b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system...
Shih-wei Liao [Sun, 29 Jul 2012 18:15:48 +0000 (11:15 -0700)]
am 06f20f02: am b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.

* commit '06f20f0253bcbf7fd3079f6f80413aaabf91732d':
  Add "abcc" (bitcode compiler) and "libportable" into system.img.

11 years agoam b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sun, 29 Jul 2012 18:13:35 +0000 (11:13 -0700)]
am b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.

* commit 'b09d26a496609fd569e94f2cfbb289ba5ea4c247':
  Add "abcc" (bitcode compiler) and "libportable" into system.img.

11 years agoAdd "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sat, 28 Jul 2012 01:04:07 +0000 (18:04 -0700)]
Add "abcc" (bitcode compiler) and "libportable" into system.img.

BUG=6886348. NDK on llvm requires bitcode compiler and libportable.

Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd

11 years agoAdd new vendors
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:41:30 +0000 (15:41 -0700)]
Add new vendors

Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e

11 years agoam 7450e4f7: am b286b76d: am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts...
Elliott Hughes [Fri, 27 Jul 2012 23:24:29 +0000 (16:24 -0700)]
am 7450e4f7: am b286b76d: am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit '7450e4f7e6c2f6f78ddd8197606ebb807ca54dba':
  Now zoneinfo prebuilts are Android modules.

11 years agoam 749ba850: am b1418f47: am 024e9ab7: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Fri, 27 Jul 2012 23:23:41 +0000 (16:23 -0700)]
am 749ba850: am b1418f47: am 024e9ab7: Reconcile with jb-mr0-release jb-release

* commit '749ba85040ce608c8cc92207a7503249110fd706':
  JZO26
  JRO03L
  JRO03K
  JRO03J
  JRO24
  JRO03I
  JZO24

11 years agoam b286b76d: am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android...
Elliott Hughes [Fri, 27 Jul 2012 22:55:35 +0000 (15:55 -0700)]
am b286b76d: am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit 'b286b76da7d0b3de6f12664aad0cdc146c736cd1':
  Now zoneinfo prebuilts are Android modules.

11 years agoam f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
Elliott Hughes [Fri, 27 Jul 2012 22:51:16 +0000 (15:51 -0700)]
am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit 'f833e0a780d576be76520c1d0b51035f589cec0b':
  Now zoneinfo prebuilts are Android modules.

11 years agoam b1418f47: am 024e9ab7: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Fri, 27 Jul 2012 22:49:17 +0000 (15:49 -0700)]
am b1418f47: am 024e9ab7: Reconcile with jb-mr0-release jb-release

* commit 'b1418f47dcf37c3d50b7c76e657ac00ce47d0618':
  JZO26
  JRO03L
  JRO03K
  JRO03J
  JRO24
  JRO03I
  JZO24

11 years agoam b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
Elliott Hughes [Fri, 27 Jul 2012 22:47:34 +0000 (15:47 -0700)]
am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit 'b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
  Now zoneinfo prebuilts are Android modules.

11 years agoam 3166fd6a: Reconcile with jb-mr1-release
The Android Open Source Project [Fri, 27 Jul 2012 22:47:19 +0000 (15:47 -0700)]
am 3166fd6a: Reconcile with jb-mr1-release

* commit '3166fd6ad9a893f26e4f881328243fdfd8c6c029':
  JOO26B
  JOO26
  JOO25
  JOO24B
  JOO24

11 years agoam 024e9ab7: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Fri, 27 Jul 2012 22:45:19 +0000 (15:45 -0700)]
am 024e9ab7: Reconcile with jb-mr0-release jb-release

* commit '024e9ab796609334a209062d449ddb4a73eb925e':
  JZO26
  JRO03L
  JRO03K
  JRO03J
  JRO24
  JRO03I
  JZO24

11 years agoReconcile with jb-mr1-release
The Android Open Source Project [Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)]
Reconcile with jb-mr1-release

Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4

11 years agoReconcile with jb-mr0-release jb-release
The Android Open Source Project [Fri, 27 Jul 2012 21:49:57 +0000 (14:49 -0700)]
Reconcile with jb-mr0-release jb-release

Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54

11 years agoMerge "Now zoneinfo prebuilts are Android modules."
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now zoneinfo prebuilts are Android modules."

11 years agoNow zoneinfo prebuilts are Android modules.
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.

(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.)

Bug: 6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7

11 years agoam fb983b57: am ab81700c: am 47e63bb4: Merge "Fix build."
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:21:43 +0000 (10:21 -0700)]
am fb983b57: am ab81700c: am 47e63bb4: Merge "Fix build."

* commit 'fb983b57d5a7d920a0f78252180b41fdeff20589':
  Fix build.

11 years agoam ab81700c: am 47e63bb4: Merge "Fix build."
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:16:49 +0000 (10:16 -0700)]
am ab81700c: am 47e63bb4: Merge "Fix build."

* commit 'ab81700ce9db23b338a9d75884425b047875b031':
  Fix build.

11 years agoam 47e63bb4: Merge "Fix build."
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:14:48 +0000 (10:14 -0700)]
am 47e63bb4: Merge "Fix build."

* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
  Fix build.

11 years agoMerge "Fix build."
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix build."

11 years agoFix build.
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29

11 years agoJZO26
The Android Automerger [Fri, 27 Jul 2012 00:50:34 +0000 (17:50 -0700)]
JZO26

11 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Fri, 27 Jul 2012 00:49:20 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev

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

11 years agoNow zoneinfo prebuilts are Android modules.
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.

Bug: 6857263
Change-Id: I793f596926de485646ed9724d2b365a51fcf489f

11 years agoam 89fa2850: Add clean step to introduce the newly added BUILD_EMULATOR.
Ying Wang [Thu, 26 Jul 2012 22:33:07 +0000 (15:33 -0700)]
am 89fa2850: Add clean step to introduce the newly added BUILD_EMULATOR.

* commit '89fa2850cc3fd602b5ec2d049516459b6348f8b6':
  Add clean step to introduce the newly added BUILD_EMULATOR.

11 years agoAdd clean step to introduce the newly added BUILD_EMULATOR.
Ying Wang [Thu, 26 Jul 2012 22:28:43 +0000 (15:28 -0700)]
Add clean step to introduce the newly added BUILD_EMULATOR.

Change-Id: I0de0625a12af0b98d6288df03024268326b909bf

11 years agoam 7d8c535c: Fix build.
Ying Wang [Thu, 26 Jul 2012 22:16:02 +0000 (15:16 -0700)]
am 7d8c535c: Fix build.

* commit '7d8c535c1f63a97a9b77fa0b5d530778640a241c':
  Fix build.

11 years agoFix build.
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29

11 years agoJOO26B
The Android Automerger [Thu, 26 Jul 2012 17:28:15 +0000 (10:28 -0700)]
JOO26B