OSDN Git Service
The Android Automerger [Tue, 7 Aug 2012 18:12:57 +0000 (11:12 -0700)]
JOO38B
The Android Automerger [Tue, 7 Aug 2012 13:36:03 +0000 (06:36 -0700)]
JOO38
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
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)
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)
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
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
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
The Android Automerger [Mon, 6 Aug 2012 20:06:02 +0000 (13:06 -0700)]
JOO37B
The Android Automerger [Mon, 6 Aug 2012 19:32:03 +0000 (12:32 -0700)]
JRO03O
The Android Automerger [Mon, 6 Aug 2012 13:30:31 +0000 (06:30 -0700)]
JOO37
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
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
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
The Android Automerger [Fri, 3 Aug 2012 22:01:00 +0000 (15:01 -0700)]
JOO33C
Paul Westbrook [Fri, 3 Aug 2012 21:21:56 +0000 (14:21 -0700)]
Merge "Add imap2 to the build" into jb-mr1-dev
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
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
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
Paul Westbrook [Fri, 3 Aug 2012 18:46:02 +0000 (11:46 -0700)]
Add imap2 to the build
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J
Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I
The Android Automerger [Fri, 3 Aug 2012 14:37:30 +0000 (07:37 -0700)]
JOO33B take two
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
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
The Android Automerger [Fri, 3 Aug 2012 02:03:27 +0000 (19:03 -0700)]
JOO33B
Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]
Merge "add extra args to mkbootimg" into jb-mr1-dev
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
Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 20:00:44 +0000 (13:00 -0700)]
JOO33 take two
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
The Android Automerger [Thu, 2 Aug 2012 15:18:45 +0000 (08:18 -0700)]
JOO33
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
The Android Automerger [Thu, 2 Aug 2012 14:06:08 +0000 (07:06 -0700)]
JOO32C
The Android Automerger [Thu, 2 Aug 2012 14:00:53 +0000 (07:00 -0700)]
JOO33
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
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
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
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.
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
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
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.
Roman Nurik [Wed, 1 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Merge "Improve print stylesheet for d.a.c." into jb-dev
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
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.
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.
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
The Android Automerger [Wed, 1 Aug 2012 14:18:49 +0000 (07:18 -0700)]
JOO32
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
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
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
The Android Automerger [Tue, 31 Jul 2012 21:08:19 +0000 (14:08 -0700)]
JZO31
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
The Android Automerger [Tue, 31 Jul 2012 20:09:31 +0000 (13:09 -0700)]
JOO31B
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
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
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
The Android Automerger [Tue, 31 Jul 2012 15:18:14 +0000 (08:18 -0700)]
JRO03N
The Android Automerger [Tue, 31 Jul 2012 14:35:49 +0000 (07:35 -0700)]
JOO31
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
Dianne Hackborn [Tue, 31 Jul 2012 00:38:04 +0000 (17:38 -0700)]
This branch is now JB MR1 development.
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
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
The Android Automerger [Mon, 30 Jul 2012 22:51:31 +0000 (15:51 -0700)]
JRO03M
The Android Automerger [Mon, 30 Jul 2012 16:46:30 +0000 (09:46 -0700)]
JOO30B
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
The Android Automerger [Mon, 30 Jul 2012 14:15:33 +0000 (07:15 -0700)]
JOO30
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
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
Ed Heyl [Sun, 29 Jul 2012 23:35:27 +0000 (16:35 -0700)]
Merge "Add new vendors" into jb-mr1-dev
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.
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.
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
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:41:30 +0000 (15:41 -0700)]
Add new vendors
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
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.
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
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.
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.
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
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.
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
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
The Android Open Source Project [Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)]
Reconcile with jb-mr1-release
Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4
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
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now 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
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:21:43 +0000 (10:21 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:16:49 +0000 (10:16 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:14:48 +0000 (10:14 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix 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
The Android Automerger [Fri, 27 Jul 2012 00:50:34 +0000 (17:50 -0700)]
JZO26
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
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
Bug:
6857263
Change-Id: I793f596926de485646ed9724d2b365a51fcf489f
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.
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
Ying Wang [Thu, 26 Jul 2012 22:16:02 +0000 (15:16 -0700)]
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