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
Ying Wang
7023f6179d
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
2012-07-27 09:57:36 -07:00
The Android Automerger
e2b8f8649c
JZO26
2012-07-26 17:50:34 -07:00
The Android Automerger
c9d8844cbd
merge in jb-mr0-release history after reset to jb-dev
2012-07-26 17:49:20 -07:00
The Android Automerger
5be30d0974
JRO03L
2012-07-26 16:06:25 -07:00
Ying Wang
89fa2850cc
Add clean step to introduce the newly added BUILD_EMULATOR.
...
Change-Id: I0de0625a12af0b98d6288df03024268326b909bf
2012-07-26 15:28:43 -07:00
Ying Wang
7d8c535c1f
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
2012-07-26 15:12:21 -07:00
Ed Heyl
f8a3059892
resolved conflict in mergre to goog/master
...
Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
2012-07-26 07:45:43 -07:00
Nick Kralevich
4c9c895ab8
am 07a06f6e
: am f0daadf6
: am 297d6c02
: Merge "Add property_contexts to SELINUX_DEPENDS."
...
* commit '07a06f6e4487f2ad7d667d134fe19a089bee8412':
Add property_contexts to SELINUX_DEPENDS.
2012-07-25 23:00:29 -07:00
Joe Onorato
2dd9902cf9
am 4ae631f4
: am c11b5efa
: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
...
* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
Should have been included in 74e883d141
2012-07-25 22:24:02 -07:00
Joe Onorato
42f0127a06
am e3adc7fd
: am c22da7d7
: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
...
* commit 'e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
2012-07-25 22:24:00 -07:00
Joe Onorato
4ae631f456
am c11b5efa
: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
...
* commit 'c11b5efa3a20e2364dfffbfa205306b9bd2e538a':
Should have been included in 74e883d141
2012-07-25 22:22:15 -07:00
Joe Onorato
e3adc7fdcc
am c22da7d7
: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
...
* commit 'c22da7d7e2de0b4cbeefb533990d81581d19432a':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
2012-07-25 22:22:14 -07:00
Joe Onorato
c11b5efa3a
Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
2012-07-25 17:56:24 -07:00
Joe Onorato
e35a445f2f
Should have been included in 74e883d141
...
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
2012-07-25 17:55:03 -07:00
Joe Onorato
c22da7d7e2
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
2012-07-25 17:41:50 -07:00
Andrew Hsieh
4b0c5ee8e0
am c759e468
: am b7391efb
: Merge "Add -fuse-ld=bfd to x86 target"
...
* commit 'c759e468995417a0c8c0ca7ca38e4c937a176ab8':
Add -fuse-ld=bfd to x86 target
2012-07-25 15:06:00 -07:00