Ying Wang
7f9db64d0e
Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev
2012-08-03 17:46:49 -07:00
Ying Wang
c10da6c540
Add libstagefright and libstagefright_chromium_http to core.mk.
...
Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
2012-08-03 17:44:06 -07:00
Paul Westbrook
acf206bc5e
Merge "Add imap2 to the build" into jb-mr1-dev
2012-08-03 14:21:56 -07:00
The Android Open Source Project
fa3c2d9a76
am ad808f5d: (-s ours) Reconcile with jb-release - do not merge
...
* commit 'ad808f5da422b13489edb04b38daf871e5f977a6':
JRO03L
JRO03K
JRO03J
JRO03I
2012-08-03 13:25:06 -07:00
The Android Open Source Project
ad808f5da4
Reconcile with jb-release - do not merge
...
Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a
2012-08-03 13:23:06 -07:00
The Android Open Source Project
d842ff1660
Reconcile AOSP and GOOG jb-release
...
Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611
2012-08-03 12:11:39 -07:00
Paul Westbrook
95781f03c9
Add imap2 to the build
...
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
2012-08-03 11:47:53 -07:00
The Android Automerger
43c06c9a3b
JRO03L
2012-08-03 11:34:17 -07:00
The Android Automerger
ad0fad3b8e
JRO03K
2012-08-03 11:34:12 -07:00
The Android Automerger
524b316b8e
JRO03J
...
Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43
2012-08-03 11:33:54 -07:00
The Android Automerger
5a625796d6
JRO03I
2012-08-03 11:33:28 -07:00
Shih-wei Liao
c814bcefd7
Fix build: After merging in Clang, -Wno-psabi is no longer supported.
...
-Wno-unused-but-set-variable is not supported either.
Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086
2012-08-03 05:17:23 -07:00
Doug Zongker
1e845d33af
Merge "add extra args to mkbootimg" into jb-mr1-dev
2012-08-02 15:06:10 -07:00
Doug Zongker
d513160b76
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
2012-08-02 15:03:41 -07:00
Keun young Park
15b2b0f711
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
2012-08-02 14:29:05 -07:00
Keun young Park
4da8e127c7
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
2012-08-02 12:51:59 -07:00
Keun young Park
cdbf0292e4
Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
2012-08-01 15:39:12 -07:00
Keun young Park
add5271a56
add missing telephony libs for PDK mini config
...
Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99
2012-08-01 15:02:35 -07:00
Roman Nurik
f5bd3bce67
am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
...
* commit '2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
Improve print stylesheet for d.a.c.
2012-08-01 14:48:36 -07:00
Keun young Park
fad81e8997
Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
2012-08-01 13:08:56 -07:00
Keun young Park
722266918f
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
2012-08-01 12:49:01 -07:00
Roman Nurik
2461af44c1
am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
...
* commit 'c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
Improve print stylesheet for d.a.c.
2012-08-01 12:41:10 -07:00
Roman Nurik
c9e30dce7c
Merge "Improve print stylesheet for d.a.c." into jb-dev
2012-08-01 12:39:19 -07:00
Roman Nurik
393830e7b7
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
2012-08-01 12:21:16 -07:00
Scott Main
72972445f2
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.
2012-08-01 12:15:24 -07:00
Scott Main
b736e07cbb
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.
2012-08-01 12:12:51 -07:00
Scott Main
2ccbd3f8d4
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
...
Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a
2012-08-01 12:05:12 -07:00
The Android Open Source Project
2a5f755a79
am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '8665eb732364b31506719dcce99237e13cc87866':
JZO31
JRO03N
JRO03M
2012-07-31 14:49:13 -07:00
The Android Open Source Project
8665eb7323
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95
2012-07-31 14:47:40 -07:00
The Android Automerger
4f587c5839
JZO31
2012-07-31 14:08:19 -07:00
The Android Automerger
651c69b67c
merge in jb-mr0-release history after reset to jb-dev
2012-07-31 14:07:00 -07:00
Scott Main
ff8d3674ab
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
2012-07-31 12:47:42 -07:00
Scott Main
37132103a2
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
2012-07-31 12:45:28 -07:00
Scott Main
a8d7485de2
Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev
2012-07-31 12:43:29 -07:00
The Android Automerger
ef88e79f95
JRO03N
2012-07-31 08:18:14 -07:00
Dianne Hackborn
75f4c72320
This branch is now JB MR1 development.
...
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
2012-07-30 18:32:04 -07:00
Scott Main
b505ca6db5
add script to create links on topic landing page for first doc that use the doc's title
...
Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8
2012-07-30 17:04:11 -07:00
The Android Automerger
c8c68e3cd4
JRO03M
2012-07-30 15:51:31 -07:00
Ed Heyl
3d71b0c7e2
Merge "Add new vendors" into jb-mr1-dev
2012-07-29 16:35:27 -07:00
Shih-wei Liao
b09d26a496
Add "abcc" (bitcode compiler) and "libportable" into system.img.
...
BUG=6886348. NDK on llvm requires bitcode compiler and libportable.
Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd
2012-07-27 23:32:26 -07:00
Jean-Baptiste Queru
228e8cf660
Add new vendors
...
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
2012-07-27 23:19:51 -07:00
Elliott Hughes
b286b76da7
am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
...
* commit 'f833e0a780d576be76520c1d0b51035f589cec0b':
Now zoneinfo prebuilts are Android modules.
2012-07-27 15:51:16 -07:00
Elliott Hughes
f833e0a780
am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
...
* commit 'b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
Now zoneinfo prebuilts are Android modules.
2012-07-27 15:47:34 -07:00
The Android Open Source Project
b1418f47dc
am 024e9ab7: Reconcile with jb-mr0-release jb-release
...
* commit '024e9ab796609334a209062d449ddb4a73eb925e':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
2012-07-27 15:45:19 -07:00
The Android Open Source Project
024e9ab796
Reconcile with jb-mr0-release jb-release
...
Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54
2012-07-27 14:49:58 -07:00
Elliott Hughes
b9c2a66a48
Merge "Now zoneinfo prebuilts are Android modules."
2012-07-27 14:14:57 -07:00
Ying Wang
5fb2ef65d4
Now zoneinfo prebuilts are Android modules.
...
(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.)
Bug: 6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
2012-07-27 13:46:40 -07:00
Jean-Baptiste Queru
fb983b57d5
am ab81700c: am 47e63bb4: Merge "Fix build."
...
* commit 'ab81700ce9db23b338a9d75884425b047875b031':
Fix build.
2012-07-27 10:16:49 -07:00
Jean-Baptiste Queru
ab81700ce9
am 47e63bb4: Merge "Fix build."
...
* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
Fix build.
2012-07-27 10:14:48 -07:00
Jean-Baptiste Queru
47e63bb4e4
Merge "Fix build."
2012-07-27 10:05:23 -07:00