OSDN Git Service
Elliott Hughes [Sat, 11 Aug 2012 22:18:07 +0000 (15:18 -0700)]
am
d99a3665: am
880d3f39: resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
* commit '
d99a36651079b47ff159ef917cc513fdb5364bef':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 22:16:31 +0000 (15:16 -0700)]
am
880d3f39: resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
* commit '
880d3f39f711f9ca6d2ba5c9cf127265fa39efad':
Remove TARGET_linux-sh.mk.
Ying Wang [Sat, 11 Aug 2012 20:18:21 +0000 (13:18 -0700)]
Merge "Don't pass LOCAL_CFLAGS when compiling assembly code."
Ying Wang [Sat, 11 Aug 2012 20:16:33 +0000 (13:16 -0700)]
Merge "Adopt the new prebuilts/ndk/<number> paths."
Elliott Hughes [Sat, 11 Aug 2012 19:00:51 +0000 (12:00 -0700)]
resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
Change-Id: I0978f511f807797f89be4002bca654492231761c
Elliott Hughes [Sat, 11 Aug 2012 18:51:39 +0000 (11:51 -0700)]
am
20e713d1: Merge "Remove TARGET_linux-sh.mk."
* commit '
20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove TARGET_linux-sh.mk."
Nick Pelly [Sat, 11 Aug 2012 01:57:54 +0000 (18:57 -0700)]
am
33b8321d: am
0de821b0: Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
* commit '
33b8321d2e3ba308e43fd196ce5dfc832a097a69':
Include FusedLocation.apk on all builds.
Nick Pelly [Sat, 11 Aug 2012 01:56:43 +0000 (18:56 -0700)]
am
0de821b0: Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
* commit '
0de821b0b10bbf3404827f21bfa9a2489d7358c5':
Include FusedLocation.apk on all builds.
Nick Pelly [Sat, 11 Aug 2012 01:54:22 +0000 (18:54 -0700)]
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
Nick Pelly [Sat, 11 Aug 2012 01:50:36 +0000 (18:50 -0700)]
Include FusedLocation.apk on all builds.
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
Guang Zhu [Sat, 11 Aug 2012 01:48:47 +0000 (18:48 -0700)]
am
e4662db1: am
62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
* commit '
e4662db1601c189e920637a5d9efbb175edefb74':
Use new flag for emma instrumented build and limit to apps only
Guang Zhu [Sat, 11 Aug 2012 01:46:31 +0000 (18:46 -0700)]
am
62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
* commit '
62f034792d560055c80834981ebffeb3bfa9db39':
Use new flag for emma instrumented build and limit to apps only
Guang Zhu [Sat, 11 Aug 2012 01:44:42 +0000 (18:44 -0700)]
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
Keun young Park [Sat, 11 Aug 2012 01:31:25 +0000 (18:31 -0700)]
am
d4c5dd0c: am
f15a11c5: add libstagefright_chromium_http to mini for streaming
* commit '
d4c5dd0ceae2e1467b98a7197d7d61a315ea6edd':
add libstagefright_chromium_http to mini for streaming
Keun young Park [Sat, 11 Aug 2012 01:28:56 +0000 (18:28 -0700)]
am
f15a11c5: add libstagefright_chromium_http to mini for streaming
* commit '
f15a11c58ddb7343ba89298bc45f264f19755fec':
add libstagefright_chromium_http to mini for streaming
Ying Wang [Fri, 10 Aug 2012 23:30:42 +0000 (16:30 -0700)]
Don't pass LOCAL_CFLAGS when compiling assembly code.
Bug:
6967574
Change-Id: Id428884dde3026c32fa6abcabbc88d188b7e9a38
Keun young Park [Fri, 10 Aug 2012 23:59:54 +0000 (16:59 -0700)]
add libstagefright_chromium_http to mini for streaming
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
Elliott Hughes [Fri, 10 Aug 2012 22:36:51 +0000 (15:36 -0700)]
Remove TARGET_linux-sh.mk.
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
Ying Wang [Fri, 10 Aug 2012 22:12:15 +0000 (15:12 -0700)]
Allow full_x86 and full_mips in unbundled build.
So we can do unbundled builds for x86 and mips devices.
Change-Id: Ibd8c3b0371c316b713a748a6e6ce14fe98fdc4aa
Nick Kralevich [Fri, 10 Aug 2012 21:15:24 +0000 (14:15 -0700)]
am
1b3914f5: am
62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
* commit '
1b3914f595a6c961d597d7dc66fb95f8f2afef24':
arm: add --warn-shared-textrel
Nick Kralevich [Fri, 10 Aug 2012 21:13:00 +0000 (14:13 -0700)]
am
62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
* commit '
62481e30f331c09aed4270cbd6ee87b7a6baeb6e':
arm: add --warn-shared-textrel
Nick Kralevich [Fri, 10 Aug 2012 21:11:14 +0000 (14:11 -0700)]
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
Nick Kralevich [Fri, 10 Aug 2012 19:51:26 +0000 (12:51 -0700)]
arm: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
References: http://www.akkadia.org/drepper/textrelocs.html
Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:48:48 +0000 (12:48 -0700)]
am
224f28a8: am
049d97d7: am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
224f28a845a107d46500c7977cb0e2abeff1ebba':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:48:47 +0000 (12:48 -0700)]
am
8e175c8a: am
c244634e: am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
8e175c8a99c3a85c8cc726d619a784fc3c539a41':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:31 +0000 (12:46 -0700)]
am
049d97d7: am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
049d97d7789a9fa29845effb3323203be36e3f97':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:29 +0000 (12:46 -0700)]
am
c244634e: am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
c244634e8f9b89a652dc82df1e8f803d01b61509':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:17 +0000 (12:46 -0700)]
am
84d4afa6: am
91afae6c: resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
* commit '
84d4afa66e40478a813b738e943d8e9e54abf342':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
91afae6c: resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
* commit '
91afae6c039d06df83d708834c96d47858406e2a':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:58 +0000 (12:43 -0700)]
am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)]
resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
The Android Open Source Project [Fri, 10 Aug 2012 19:42:16 +0000 (12:42 -0700)]
am
f09cdd92: (-s ours) am
baa97012: am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
f09cdd928d4874f16a72ce79e3f4a0c749a9abc3':
JZO40
The Android Open Source Project [Fri, 10 Aug 2012 19:40:20 +0000 (12:40 -0700)]
am
baa97012: am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
baa97012143a8601aff04428a179446d8182a4a4':
JZO40
The Android Open Source Project [Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)]
am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
Ying Wang [Fri, 10 Aug 2012 17:57:37 +0000 (10:57 -0700)]
Adopt the new prebuilts/ndk/<number> paths.
Bug:
6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:42 +0000 (09:23 -0700)]
am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:39 +0000 (09:23 -0700)]
am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:38 +0000 (09:23 -0700)]
am
e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit '
e443a9e92f323bff5bb304e1baf8b00ed18888be':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:16:20 +0000 (09:16 -0700)]
Merge "MIPS support to *.mk files and envsetup.sh"
Raghu Gandham [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
The Android Open Source Project [Fri, 10 Aug 2012 15:53:29 +0000 (08:53 -0700)]
am
8e1a8753: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8e1a87533521ac5918855256dbb92727eda1c953':
JOO40B
JOO40
JOO39B
The Android Open Source Project [Fri, 10 Aug 2012 15:51:46 +0000 (08:51 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:33 +0000 (08:39 -0700)]
Merge "Support for MIPS Build targets."
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:09 +0000 (08:39 -0700)]
Merge "Modify full_mips-eng build in line with the full-eng build"
The Android Open Source Project [Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41
The Android Automerger [Thu, 9 Aug 2012 23:02:33 +0000 (16:02 -0700)]
JOO40B
Kenny Root [Thu, 9 Aug 2012 20:06:24 +0000 (13:06 -0700)]
am
623a098c: am
c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-dev
* commit '
623a098c0d1e1c4d0eeb5136d18c6e78e06637b7':
Add make_ext4fs to all builds
Kenny Root [Thu, 9 Aug 2012 20:04:58 +0000 (13:04 -0700)]
am
c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-dev
* commit '
c2872a62402c7e075a1f9cfba04c4e4d65c30c8f':
Add make_ext4fs to all builds
Kenny Root [Thu, 9 Aug 2012 20:03:10 +0000 (13:03 -0700)]
Merge "Add make_ext4fs to all builds" into jb-mr1-dev
Doug Zongker [Thu, 9 Aug 2012 19:45:13 +0000 (12:45 -0700)]
am
c8d8a1e6: am
72f0b676: tidy up building of recovery ramdisk image
* commit '
c8d8a1e62b81f8832c1566f3f12f842abb2bfe03':
tidy up building of recovery ramdisk image
Doug Zongker [Thu, 9 Aug 2012 19:42:44 +0000 (12:42 -0700)]
am
72f0b676: tidy up building of recovery ramdisk image
* commit '
72f0b67673adecd824bf177b680b20b93e3bc6ed':
tidy up building of recovery ramdisk image
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
Bug:
6960586
Change-Id: I7c10b8065a76ec7a43f79445f429d5a93750585d
The Android Automerger [Thu, 9 Aug 2012 18:37:32 +0000 (11:37 -0700)]
JZO40
The Android Automerger [Thu, 9 Aug 2012 18:36:36 +0000 (11:36 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Thu, 9 Aug 2012 16:30:20 +0000 (09:30 -0700)]
JOO40
The Android Automerger [Thu, 9 Aug 2012 16:29:42 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Doug Zongker [Wed, 8 Aug 2012 23:26:17 +0000 (16:26 -0700)]
tidy up building of recovery ramdisk image
Copy init.recovery.*.rc files (if any) from the main system ramdisk,
and hide all the commands.
Change-Id: I4d4fcf25b66ddea70e43282d466983e9643c9bea
Colin Cross [Thu, 9 Aug 2012 00:56:40 +0000 (17:56 -0700)]
am
7aeaaa04: am
e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files" into jb-mr1-dev
* commit '
7aeaaa04a079401e1c76b2d68c6a5308ddb3c0aa':
recovery: don't delete hardware specific init*.rc files
Colin Cross [Thu, 9 Aug 2012 00:55:31 +0000 (17:55 -0700)]
am
e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files" into jb-mr1-dev
* commit '
e98b836f261aa822204f5fdbae7cfde6c77dbfba':
recovery: don't delete hardware specific init*.rc files
Colin Cross [Thu, 9 Aug 2012 00:53:37 +0000 (17:53 -0700)]
Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev
Guang Zhu [Mon, 6 Aug 2012 23:11:05 +0000 (16:11 -0700)]
Use new flag for emma instrumented build and limit to apps only
Based on existing setup, when EMMA_INSTRUMENT is used on a full
build, all Java modules will be processed with emma instrument
unless otherwise marked in their own Makefiles.
For the purpose of collecting code coverage, emma-instrument
all Java modules aren't that useful, instead, instrumenting all
the app packages is more useful. This change adds a new flag
EMMA_FULL_APP_INSTRUMENT, which can be used with a full build
to instrument all app packages.
Change-Id: Ie143fed49c23402b21f6cccac2ef25741726be45
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.
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.
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
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
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
The Android Automerger [Wed, 8 Aug 2012 22:06:55 +0000 (15:06 -0700)]
JOO39B
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
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
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
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]
Merge "x86: cleanups for toolchain"
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
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
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
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:18:56 +0000 (13:18 -0700)]
Merge "definitions.mk: Don't use GCC '@' parameter"
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
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
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
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
Colin Cross [Wed, 8 Aug 2012 19:59:32 +0000 (12:59 -0700)]
recovery: don't delete hardware specific init*.rc files
init used to automatically execute hardware specific init.rc files from
init.<hardware>.rc. If the hardware specific init.rc file was installed
in recovery.img, various unwanted services would try to start, so init*.rc
was deleted when creating the recovery root directory.
init was recently modified to explicitly import init.${ro.hardware}.rc
from the default init.rc, rather than always trying to load it. Since
recovery replaces the default init.rc with a custom one, it will never
try to load hardware specific init files.
In addition, there are cases where we need to start hardware specific
services, for example watchdogd, so we need
init.recovery.${ro.hardware}.rc to be installed.
Modify the build rule to delete the default init.rc from the recovery
root directory so it can be replaced with the custom recovery init.rc,
but leave all the hardware specific init files in place.
Bug:
6953625
Change-Id: I5d9555e3d54d2f1d9f49fb981bd412c53741337e
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]
Merge "core/Makefile: also look for device/*/build/tasks"
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
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
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
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
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
Elliott Hughes [Wed, 8 Aug 2012 16:49:15 +0000 (09:49 -0700)]
Merge "Remove the obsolete bin2asm tool."
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
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
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
The Android Automerger [Wed, 8 Aug 2012 13:48:58 +0000 (06:48 -0700)]
JOO39
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
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
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
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
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
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
The Android Automerger [Tue, 7 Aug 2012 20:02:14 +0000 (13:02 -0700)]
JZO38