smain@google.com
b6d4185317
am d357cc2f: am baf5b60b: make primary landing button dark red
...
* commit 'd357cc2f011e9c9e361ec59482db9bce21198e43':
make primary landing button dark red
2014-06-20 22:33:33 +00:00
smain@google.com
971188d104
am b07a681e: 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 'b07a681e9ed1c5bc6f06880eee8e39304fea6b56':
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
2014-06-20 22:33:32 +00:00
Tsu Chiang Chuang
bcf11b0b0f
add jdwp tests to CTS.
...
Bug: 8538755
Change-Id: Ie55c0f35ff956726a4f08734c2ad4dc03862dac7
2014-06-20 12:41:48 -07:00
smain@google.com
1ac633c4c8
Merge "fix vertical spacing following collection" into klp-modular-dev
2014-06-20 00:20:03 +00:00
Ying Wang
b574564f2e
Reinforce the dependency on package-export.apk.
...
This fixes the bug that if an app has no resource at all, we should
still set up the dependency on package-export.apk, because the
AndroidManifest.xml may still reference symbols in package-export.apk.
Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
2014-06-19 16:07:30 -07:00
smain@google.com
f82118195e
am b8281c70: add new preview watermark for docs
...
* commit 'b8281c70915cc296d7083f46811850e6888ffdf3':
add new preview watermark for docs
2014-06-19 17:49:18 +00:00
smain@google.com
b8281c7091
add new preview watermark for docs
...
Change-Id: Idd63395b6b53674d0db87fbbcf37eb4864accacd
2014-06-19 10:44:03 -07:00
Ying Wang
240e136efd
am 318c8e76: am 17c6426e: Merge "Document the worker_threads option."
...
* commit '318c8e76ee8f47fb9f077e419713cf4dbb454788':
Document the worker_threads option.
2014-06-19 17:16:39 +00:00
Ying Wang
318c8e76ee
am 17c6426e: Merge "Document the worker_threads option."
...
* commit '17c6426e75ef46238f5866f9a9295db4a95f21b5':
Document the worker_threads option.
2014-06-19 17:11:59 +00:00
Neil Fuller
cc317c40d3
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
2014-06-19 10:39:23 +00:00
Neil Fuller
40f3300577
am fa63e306: Merge "Fix the CTS build now that core is gone"
...
* commit 'fa63e30605ff723cfef493540553dabdf0440339':
Fix the CTS build now that core is gone
2014-06-19 10:34:02 +00:00
Bill Yi
b76d4093d3
Restore AOSP-style version numbers - DO NOT MERGE
2014-06-19 00:22:38 -07:00
Brian Carlstrom
8fd9944e8f
am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"
...
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
Switch from core to core-libart
2014-06-19 02:17:54 +00:00
Brian Carlstrom
32d25fdabf
am dab766a7: Merge "Switch from core to core-libart"
...
* commit 'dab766a7312b1313c89930b5307f33f0baec1549':
Switch from core to core-libart
2014-06-19 02:14:26 +00:00
Ying Wang
451dbd7c00
am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
...
* commit 'cc2e90e653c55724f20410347d709b70b1eaf105':
Rewrite the clean steps for TARGET_2ND_ARCH.
2014-06-18 22:58:30 +00:00
Brian Carlstrom
dab766a731
Merge "Switch from core to core-libart"
2014-06-18 22:48:04 +00:00
Brian Carlstrom
b1dafb1804
Switch from core to core-libart
...
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Ying Wang
cc2e90e653
am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
...
* commit '0f1ca830ce14277f2fe71c066b4e83ee53727f77':
Rewrite the clean steps for TARGET_2ND_ARCH.
2014-06-18 22:42:18 +00:00
Ying Wang
17c6426e75
Merge "Document the worker_threads option."
2014-06-18 21:47:53 +00:00
Brian Carlstrom
0d073451e7
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.
2014-06-18 20:51:14 +00:00
Brian Carlstrom
9a954de366
am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
...
* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 20:46:53 +00:00
Colin Cross
a1ac473676
am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
...
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
2014-06-18 20:24:56 +00:00
Colin Cross
b110da5f2b
am 9d8854e3: Merge "build: delete 64-bit blacklist"
...
* commit '9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44':
build: delete 64-bit blacklist
2014-06-18 20:20:58 +00:00
Ying Wang
0f1ca830ce
Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
2014-06-18 19:25:04 +00:00
Ying Wang
f6268b8ed9
Rewrite the clean steps for TARGET_2ND_ARCH.
...
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.
Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
2014-06-18 14:17:13 -07:00
Brian Carlstrom
8fb55d06c7
Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
2014-06-18 19:25:04 +00:00
Ian Rogers
a00ba56c63
Remove some uses of the deprecated WITH_HOST_DALVIK.
...
Bug: 13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
2014-06-18 13:38:44 -07:00
Ying Wang
88440c536b
am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."
...
* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
Use the correct MKBOOTIMG.
2014-06-18 18:41:01 +00:00
Ying Wang
5d88b3d7d6
am c4262982: Merge "Use the correct MKBOOTIMG."
...
* commit 'c426298280cea52af693ce76fe8643012ebe54b2':
Use the correct MKBOOTIMG.
2014-06-18 18:36:56 +00:00
smain@google.com
873234bd7a
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
2014-06-18 16:34:40 +00:00
Elliott Hughes
1a03ddb805
am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
...
* commit '09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
Removed /system/bin prefix from gdbclient.
2014-06-18 00:55:33 +00:00
Elliott Hughes
09a4cac12e
am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
...
* commit '7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3':
Removed /system/bin prefix from gdbclient.
2014-06-18 00:50:43 +00:00
Deepanshu Gupta
849cf47483
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]
2014-06-18 00:25:30 +00:00
Xavier Ducrohet
e87fcf5e16
Revert "Add missing support lib to list."
...
This reverts commit b3ae5354c3
.
2014-06-17 17:25:18 -07:00
Deepanshu Gupta
aaa502bc9e
am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
...
* commit 'e662adf748be5d8df6056f4cf5da2c821bc27c59':
Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:15:39 +00:00
Deepanshu Gupta
e662adf748
am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
...
* commit '2a7f1c59300ee462b63e3065f65f24291ca78043':
Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:10:39 +00:00
Brian Carlstrom
a44f9a35a2
am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."
...
* commit 'edbc4595b817aef5f620e78dc283d8cc8fccff2a':
Help catch common 32/64-bit errors.
2014-06-17 23:34:52 +00:00
Brian Carlstrom
edbc4595b8
am d51730a6: Merge "Help catch common 32/64-bit errors."
...
* commit 'd51730a64fac296f42f28ac84feca02a9ee6ef15':
Help catch common 32/64-bit errors.
2014-06-17 23:31:00 +00:00
Neil Fuller
fa63e30605
Merge "Fix the CTS build now that core is gone"
2014-06-17 22:02:27 +00:00
Neil Fuller
c61caf11a0
Fix the CTS build now that core is gone
...
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
2014-06-19 11:26:54 +01:00
Ying Wang
c8bdce1a72
Merge "Create symlink /system/vendor if necessary."
2014-06-17 21:43:29 +00:00
smain@google.com
5c14a0f761
am f8211819: am b8281c70: add new preview watermark for docs
...
* commit 'f82118195ec77a415d48220eaf87abad754e31bc':
add new preview watermark for docs
2014-06-19 17:54:46 +00:00
Ying Wang
f5770d78da
resolved conflicts for merge of 240e136e
to master
...
Change-Id: Ic6e2cbe593914ddb613454581964c5d3d443b9d5
2014-06-19 10:32:35 -07:00
Neil Fuller
50f0eab1cd
am cc317c40: am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"
...
* commit 'cc317c40d3c087725e4ab9926ad83903495cd7c5':
Fix the CTS build now that core is gone
2014-06-19 10:43:40 +00:00
Ying Wang
23898df867
Create symlink /system/vendor if necessary.
...
Bug: 15728378
Change-Id: I0fe621096bb264882dc1b6face7440298fb56af0
2014-06-18 20:26:24 -07:00
Daniel Rosenberg
0df5e7270b
Added filesystem management tools to core_minimal.mk and core_tiny.mk
...
Required for supporting resizing asecs
Change-Id: If7de23aa4baf97f3d0ccec423e52534f379f0881
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-18 23:15:20 +00:00
Ying Wang
bfc7fb23ee
am 451dbd7c: am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
...
* commit '451dbd7c006177edb56fc5036ae8c3c110c5f2fd':
Rewrite the clean steps for TARGET_2ND_ARCH.
2014-06-18 23:03:26 +00:00
Brian Carlstrom
85b70c039f
am 0d073451: am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
...
* commit '0d073451e7a453ccfb952505b27ec1effdc3a674':
Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 21:40:31 +00:00
Colin Cross
bf2f0c729b
am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
...
* commit 'a1ac47367636c0473156679f8f30af626df7da85':
build: delete 64-bit blacklist
2014-06-18 21:40:27 +00:00
Ying Wang
69c27d9ad9
am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."
...
* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
Use the correct MKBOOTIMG.
2014-06-18 21:09:30 +00:00