OSDN Git Service
smain@google.com [Wed, 25 Jun 2014 22:23:02 +0000 (22:23 +0000)]
am
5771ee3c: add style for stand-alone back link with left arrow
* commit '
5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
add style for stand-alone back link with left arrow
smain@google.com [Wed, 25 Jun 2014 22:12:52 +0000 (15:12 -0700)]
add style for stand-alone back link with left arrow
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
smain@google.com [Wed, 25 Jun 2014 19:12:42 +0000 (19:12 +0000)]
am
bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit '
bb9ecf420f136681a3bd4d5503207733b4dc283b':
undo the butterbar change, because automerger is ruthless
Ying Wang [Wed, 25 Jun 2014 18:46:34 +0000 (18:46 +0000)]
am
1a3d260f: am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
1a3d260f68755b476aa867477fc75d47ef5317bf':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 18:37:53 +0000 (18:37 +0000)]
am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
e69d4350cd4af04349b703ba169ba516a96913ba':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 18:33:51 +0000 (18:33 +0000)]
Merge "Support to add JNI of both archs in multilib build."
Ying Wang [Wed, 25 Jun 2014 03:01:52 +0000 (20:01 -0700)]
Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug:
15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
smain@google.com [Wed, 25 Jun 2014 01:40:36 +0000 (18:40 -0700)]
undo the butterbar change, because automerger is ruthless
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
Michael Wright [Wed, 25 Jun 2014 01:36:16 +0000 (01:36 +0000)]
am
e49d461a: am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
Invoke debuggerd64 when appropriate with stacks.
Michael Wright [Wed, 25 Jun 2014 01:30:40 +0000 (01:30 +0000)]
am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60':
Invoke debuggerd64 when appropriate with stacks.
smain@google.com [Wed, 25 Jun 2014 00:42:51 +0000 (00:42 +0000)]
am
04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
* commit '
04edc344a1887465692b49e3eb58e03dccedd675':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
smain@google.com [Wed, 25 Jun 2014 00:27:58 +0000 (00:27 +0000)]
am
58b617b9: am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:24:34 +0000 (00:24 +0000)]
am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
cd59b7dfdb392153422f5618e2d6e847dcff790b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:19:46 +0000 (00:19 +0000)]
am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
5f6019ab6cdcb3000eaf4b695424361a5038ade9':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:10:19 +0000 (17:10 -0700)]
DO NOT MERGE
add butterbar notice for the google IO SDK announcements
Change-Id: I25bbb0ee4cab95b0c26cd2bd517e490e44ae1465
smain@google.com [Tue, 24 Jun 2014 21:14:30 +0000 (21:14 +0000)]
am
cfb92aa9: add a smaller version of the device frame for wear
* commit '
cfb92aa963f2fee3251c393bc6dcff9b194af3e1':
add a smaller version of the device frame for wear
Ying Wang [Tue, 24 Jun 2014 19:35:31 +0000 (19:35 +0000)]
am
5899ad25: am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
5899ad254d3b94653b88e5f0f41f54690f22bd24':
Resolve :32 to 32-bit variant only if the variant exists.
smain@google.com [Tue, 24 Jun 2014 17:29:50 +0000 (10:29 -0700)]
add a smaller version of the device frame for wear
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
Ying Wang [Tue, 24 Jun 2014 18:17:52 +0000 (18:17 +0000)]
am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
Resolve :32 to 32-bit variant only if the variant exists.
smain@google.com [Tue, 24 Jun 2014 13:55:13 +0000 (13:55 +0000)]
am
abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
* commit '
abf34118c3bf14bd4acfde657b3ef8b1fb913bea':
more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
smain@google.com [Tue, 24 Jun 2014 13:55:12 +0000 (13:55 +0000)]
am
daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'next\' link in
* commit '
daa9e205bb7e0d1b0866f0ce919af7749388120f':
update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
Ying Wang [Tue, 24 Jun 2014 09:28:31 +0000 (09:28 +0000)]
am
57befc90: am
eb12847b: Merge "Switch another reference from core to core-libart"
* commit '
57befc90e924704a7c03bde9596483d0cf1bf36b':
Switch another reference from core to core-libart
Ying Wang [Tue, 24 Jun 2014 06:53:20 +0000 (06:53 +0000)]
am
eb12847b: Merge "Switch another reference from core to core-libart"
* commit '
eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
Switch another reference from core to core-libart
Ying Wang [Mon, 23 Jun 2014 22:44:38 +0000 (22:44 +0000)]
Merge "Switch another reference from core to core-libart"
Brian Carlstrom [Mon, 23 Jun 2014 22:34:17 +0000 (15:34 -0700)]
Switch another reference from core to core-libart
Bug:
14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
Michael Wright [Wed, 25 Jun 2014 01:25:49 +0000 (01:25 +0000)]
Merge "Invoke debuggerd64 when appropriate with stacks."
Michael Wright [Fri, 20 Jun 2014 02:58:12 +0000 (19:58 -0700)]
Invoke debuggerd64 when appropriate with stacks.
Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.
Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f
Ying Wang [Tue, 24 Jun 2014 18:12:47 +0000 (18:12 +0000)]
Merge "Resolve :32 to 32-bit variant only if the variant exists."
Ying Wang [Tue, 24 Jun 2014 17:22:17 +0000 (10:22 -0700)]
Resolve :32 to 32-bit variant only if the variant exists.
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.
Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
smain@google.com [Wed, 25 Jun 2014 00:37:13 +0000 (00:37 +0000)]
Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
smain@google.com [Tue, 24 Jun 2014 20:52:13 +0000 (13:52 -0700)]
DO NOT MERGE
remove leanback and recyclerview from javadoc build for d.android.com
Change-Id: I0faa1db29dcadda9bfa96bcf4096e369f0a7a4e0
Elliott Hughes [Mon, 23 Jun 2014 19:48:57 +0000 (19:48 +0000)]
am
fbc6f257: am
c04b4455: Merge "Updated gdbclient path support."
* commit '
fbc6f25712362b1f9b7b8970a96833ed0be0f12c':
Updated gdbclient path support.
Elliott Hughes [Mon, 23 Jun 2014 19:44:23 +0000 (19:44 +0000)]
am
c04b4455: Merge "Updated gdbclient path support."
* commit '
c04b4455689280fad51d48a5587fd93aa8980d01':
Updated gdbclient path support.
smain@google.com [Mon, 23 Jun 2014 18:39:02 +0000 (11:39 -0700)]
more tweaks fixes to the next/prev logic. Fix the way 'articles'
include the links. was broken for design docs, all appeared disabled.
also add 'white' style for links that appear on colored background
Change-Id: I6f59b91c1429014a90cb887a9e46880ebde0f75a
smain@google.com [Mon, 23 Jun 2014 17:43:04 +0000 (17:43 +0000)]
Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set." into klp-modular-dev
smain@google.com [Mon, 23 Jun 2014 17:22:23 +0000 (10:22 -0700)]
update the wear device frame style. rename and make frame part of css.
also update some logic with next/prev links to make navigation prev
possible while in design docs (or others that allow cross-boundary nav)
and simply remove the 'next' link in the footer when at the end of a set.
Change-Id: I83008e313fb07c9bc028e27c06e0e8478fa525f0
Ying Wang [Mon, 23 Jun 2014 16:57:53 +0000 (16:57 +0000)]
am
cd66e5ca: am
6a8b3b43: Merge " delete duplicate variable definition"
* commit '
cd66e5ca0a8ab3235b5a49c904a692ff9142999e':
delete duplicate variable definition
Ying Wang [Mon, 23 Jun 2014 16:54:01 +0000 (16:54 +0000)]
am
6a8b3b43: Merge " delete duplicate variable definition"
* commit '
6a8b3b43bbc99f23439ae32c0ec1180d5586b773':
delete duplicate variable definition
Robert Ly [Mon, 23 Jun 2014 09:56:06 +0000 (09:56 +0000)]
am
69a08861: fix preview link
* commit '
69a0886170560d76fe402cf21a99119689aa3a0a':
fix preview link
Robert Ly [Mon, 23 Jun 2014 06:17:33 +0000 (23:17 -0700)]
fix preview link
Change-Id: Ia4f409471e0c62b365fab7dba598e8bee690f0c3
smain@google.com [Sat, 21 Jun 2014 20:15:55 +0000 (20:15 +0000)]
am
ebed3b85: Merge "new android logo for preview docs header" into klp-modular-dev
* commit '
ebed3b8595b141de1ad8f282c52284dca1e72e19':
new android logo for preview docs header
Griff Hazen [Sat, 21 Jun 2014 20:14:40 +0000 (20:14 +0000)]
am
90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '
90e99716c8e8ebf9b3cfd56387a02f843af67351':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
Brian Carlstrom [Fri, 20 Jun 2014 22:40:34 +0000 (22:40 +0000)]
am
696f9d3e: am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
696f9d3e9cedc221cf907a5cc49f4e6533033372':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 22:40:15 +0000 (22:40 +0000)]
am
9c623577: (-s ours) am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
9c6235777e89b54fd933c187ffa1d9184086a787':
Restore AOSP-style version numbers - DO NOT MERGE
smain@google.com [Fri, 20 Jun 2014 22:30:39 +0000 (22:30 +0000)]
am
1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit '
1ac633c4c835b814545532ea71e230a5fd93cc1d':
fix vertical spacing following collection
smain@google.com [Fri, 20 Jun 2014 22:30:21 +0000 (22:30 +0000)]
am
eb01827b: reverse the blue button hover state color
* commit '
eb01827bef34ebbe8d867ec32a42b31e3c3f8abc':
reverse the blue button hover state color
smain@google.com [Fri, 20 Jun 2014 22:30:20 +0000 (22:30 +0000)]
am
baf5b60b: make primary landing button dark red
* commit '
baf5b60b1242710867878b350595cb98a9511b61':
make primary landing button dark red
smain@google.com [Fri, 20 Jun 2014 22:29:58 +0000 (22:29 +0000)]
am
cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
* commit '
cda1a9a756cbe694fda94687eccf64fdabb8c775':
add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
Elliott Hughes [Mon, 23 Jun 2014 18:47:25 +0000 (18:47 +0000)]
Merge "Updated gdbclient path support."
Brigid Smith [Fri, 20 Jun 2014 21:12:12 +0000 (14:12 -0700)]
Updated gdbclient path support.
Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin". As an example, each of the following now works.
Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping
Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping
Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509
smain@google.com [Sat, 21 Jun 2014 00:04:38 +0000 (00:04 +0000)]
Merge "new android logo for preview docs header" into klp-modular-dev
smain@google.com [Fri, 20 Jun 2014 23:54:50 +0000 (16:54 -0700)]
new android logo for preview docs header
Change-Id: I80a35bcbdb55c50a445e061212e32ed2361f983c
Ying Wang [Mon, 23 Jun 2014 16:51:26 +0000 (16:51 +0000)]
Merge " delete duplicate variable definition"
Brian Carlstrom [Fri, 20 Jun 2014 20:58:52 +0000 (20:58 +0000)]
am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
e0be9135a249ee5d60c6b897e7d538b1afb94b29':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 18:29:59 +0000 (18:29 +0000)]
am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
85fe14395b8bbc5b44383c1705f60bfdc12c61cf':
Restore AOSP-style version numbers - DO NOT MERGE
smain@google.com [Fri, 20 Jun 2014 17:22:38 +0000 (10:22 -0700)]
fix vertical spacing following collection
Change-Id: I50ec016d646a8fd92cf1f85a844cb6f3bf96cf79
smain@google.com [Fri, 20 Jun 2014 05:54:07 +0000 (22:54 -0700)]
reverse the blue button hover state color
Change-Id: Ib3b8abcd9683eda3b9a69f0c0ba1d53228191540
smain@google.com [Fri, 20 Jun 2014 05:24:44 +0000 (22:24 -0700)]
make primary landing button dark red
Change-Id: I2d515991ccdca79a28ee1ebe7706e8fbc3afc57e
Brian Carlstrom [Fri, 20 Jun 2014 20:55:58 +0000 (20:55 +0000)]
Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
Brian Carlstrom [Fri, 20 Jun 2014 20:09:25 +0000 (13:09 -0700)]
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
Bill Yi [Fri, 20 Jun 2014 17:54:09 +0000 (17:54 +0000)]
Merge "Restore AOSP-style version numbers - DO NOT MERGE"
Griff Hazen [Fri, 20 Jun 2014 19:02:18 +0000 (19:02 +0000)]
Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
So we can do incremental build across different SDK products.
(cherry picked from commit
d7af17619983c4cf679abb034469098235e63ad5)
Change-Id: I7fc1489c00511b6689d738ee12f0347618c03aa3
smain@google.com [Fri, 20 Jun 2014 00:07:46 +0000 (17:07 -0700)]
add "static" class to allow hand-written version of collection card for the homepage
and add "no-section" override to resource widget to enable title+description only card layout
and make the landing-secondary button blue
Change-Id: I4432c2ff267c20cb64f9c87524560b2d779c9e91
smain@google.com [Fri, 20 Jun 2014 17:24:18 +0000 (17:24 +0000)]
Merge "fix vertical spacing following collection" into klp-modular-dev
smain@google.com [Thu, 19 Jun 2014 17:49:18 +0000 (17:49 +0000)]
am
b8281c70: add new preview watermark for docs
* commit '
b8281c70915cc296d7083f46811850e6888ffdf3':
add new preview watermark for docs
smain@google.com [Thu, 19 Jun 2014 16:51:30 +0000 (09:51 -0700)]
add new preview watermark for docs
Change-Id: Idd63395b6b53674d0db87fbbcf37eb4864accacd
Ying Wang [Thu, 19 Jun 2014 17:16:39 +0000 (17:16 +0000)]
am
318c8e76: am
17c6426e: Merge "Document the worker_threads option."
* commit '
318c8e76ee8f47fb9f077e419713cf4dbb454788':
Document the worker_threads option.
Ying Wang [Thu, 19 Jun 2014 17:11:59 +0000 (17:11 +0000)]
am
17c6426e: Merge "Document the worker_threads option."
* commit '
17c6426e75ef46238f5866f9a9295db4a95f21b5':
Document the worker_threads option.
Neil Fuller [Thu, 19 Jun 2014 10:39:23 +0000 (10:39 +0000)]
am
40f33005: am
fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '
40f3300577d4b55926728744f1d25c08aa4e4a8b':
Fix the CTS build now that core is gone
Neil Fuller [Thu, 19 Jun 2014 10:34:02 +0000 (10:34 +0000)]
am
fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '
fa63e30605ff723cfef493540553dabdf0440339':
Fix the CTS build now that core is gone
Bill Yi [Thu, 19 Jun 2014 07:22:38 +0000 (00:22 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Brian Carlstrom [Thu, 19 Jun 2014 02:17:54 +0000 (02:17 +0000)]
am
32d25fda: am
dab766a7: Merge "Switch from core to core-libart"
* commit '
32d25fdabfaadc95292b43a29b695d8229333bcf':
Switch from core to core-libart
Brian Carlstrom [Thu, 19 Jun 2014 02:14:26 +0000 (02:14 +0000)]
am
dab766a7: Merge "Switch from core to core-libart"
* commit '
dab766a7312b1313c89930b5307f33f0baec1549':
Switch from core to core-libart
Ying Wang [Wed, 18 Jun 2014 22:58:30 +0000 (22:58 +0000)]
am
cc2e90e6: am
0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '
cc2e90e653c55724f20410347d709b70b1eaf105':
Rewrite the clean steps for TARGET_2ND_ARCH.
Brian Carlstrom [Thu, 19 Jun 2014 02:10:14 +0000 (02:10 +0000)]
Merge "Switch from core to core-libart"
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart
Bug:
14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
Ying Wang [Wed, 18 Jun 2014 22:42:18 +0000 (22:42 +0000)]
am
0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '
0f1ca830ce14277f2fe71c066b4e83ee53727f77':
Rewrite the clean steps for TARGET_2ND_ARCH.
Ying Wang [Thu, 19 Jun 2014 17:07:19 +0000 (17:07 +0000)]
Merge "Document the worker_threads option."
Brian Carlstrom [Wed, 18 Jun 2014 20:51:14 +0000 (20:51 +0000)]
am
9a954de3: am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
Remove some uses of the deprecated WITH_HOST_DALVIK.
Brian Carlstrom [Wed, 18 Jun 2014 20:46:53 +0000 (20:46 +0000)]
am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
Remove some uses of the deprecated WITH_HOST_DALVIK.
Colin Cross [Wed, 18 Jun 2014 20:24:56 +0000 (20:24 +0000)]
am
b110da5f: am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
Colin Cross [Wed, 18 Jun 2014 20:20:58 +0000 (20:20 +0000)]
am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44':
build: delete 64-bit blacklist
Ying Wang [Wed, 18 Jun 2014 21:17:45 +0000 (21:17 +0000)]
Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
Ying Wang [Wed, 18 Jun 2014 19:07:48 +0000 (12:07 -0700)]
Rewrite the clean steps for TARGET_2ND_ARCH.
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.
Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
Brian Carlstrom [Wed, 18 Jun 2014 20:44:10 +0000 (20:44 +0000)]
Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
Ian Rogers [Wed, 11 Jun 2014 23:30:04 +0000 (16:30 -0700)]
Remove some uses of the deprecated WITH_HOST_DALVIK.
Bug:
13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
Ying Wang [Wed, 18 Jun 2014 18:41:01 +0000 (18:41 +0000)]
am
5d88b3d7: am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
5d88b3d7d615995c6b1909992347fe0b5692492e':
Use the correct MKBOOTIMG.
Ying Wang [Wed, 18 Jun 2014 18:36:56 +0000 (18:36 +0000)]
am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
c426298280cea52af693ce76fe8643012ebe54b2':
Use the correct MKBOOTIMG.
smain@google.com [Wed, 18 Jun 2014 16:34:40 +0000 (16:34 +0000)]
am
38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '
384041992c734be6ec8d2469d071c3358fd15a77':
revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
Elliott Hughes [Wed, 18 Jun 2014 00:55:33 +0000 (00:55 +0000)]
am
09a4cac1: am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
Removed /system/bin prefix from gdbclient.
Elliott Hughes [Wed, 18 Jun 2014 00:50:43 +0000 (00:50 +0000)]
am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3':
Removed /system/bin prefix from gdbclient.
Deepanshu Gupta [Wed, 18 Jun 2014 00:25:30 +0000 (00:25 +0000)]
am
aaa502bc: am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
aaa502bc9ee796c4121cc275834f083b85b4e71e':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:15:39 +0000 (00:15 +0000)]
am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
e662adf748be5d8df6056f4cf5da2c821bc27c59':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:39 +0000 (00:10 +0000)]
am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
2a7f1c59300ee462b63e3065f65f24291ca78043':
Integrate build_font.py [DO NOT MERGE]
Brian Carlstrom [Tue, 17 Jun 2014 23:34:52 +0000 (23:34 +0000)]
am
edbc4595: am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
edbc4595b817aef5f620e78dc283d8cc8fccff2a':
Help catch common 32/64-bit errors.
Brian Carlstrom [Tue, 17 Jun 2014 23:31:00 +0000 (23:31 +0000)]
am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
d51730a64fac296f42f28ac84feca02a9ee6ef15':
Help catch common 32/64-bit errors.
Neil Fuller [Thu, 19 Jun 2014 10:29:38 +0000 (10:29 +0000)]
Merge "Fix the CTS build now that core is gone"
Neil Fuller [Thu, 19 Jun 2014 10:21:08 +0000 (11:21 +0100)]
Fix the CTS build now that core is gone
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
Colin Cross [Wed, 18 Jun 2014 20:17:06 +0000 (20:17 +0000)]
Merge "build: delete 64-bit blacklist"