OSDN Git Service
Stephen Hines [Mon, 12 May 2014 23:26:39 +0000 (23:26 +0000)]
am
42b916f4: am
4dcf3dbf: Merge "Switch to Clang 3.4 prebuilts."
* commit '
42b916f43585f399fc8aa4a02e56ea2461645d19':
Ying Wang [Mon, 12 May 2014 23:26:38 +0000 (23:26 +0000)]
Stephen Hines [Mon, 12 May 2014 23:26:37 +0000 (23:26 +0000)]
Torne (Richard Coles) [Mon, 12 May 2014 23:26:36 +0000 (23:26 +0000)]
am
998880e6: am
f93beb21: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
998880e6d84cc8275bf4150dbcbda90881f2adc6':
Ying Wang [Mon, 12 May 2014 23:26:35 +0000 (23:26 +0000)]
am
bc791901: am
d3579f4e: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
bc7919015316616f3b63b3a1d8bcf494c8a13235':
Colin Cross [Mon, 12 May 2014 23:26:34 +0000 (23:26 +0000)]
Colin Cross [Mon, 12 May 2014 23:26:33 +0000 (23:26 +0000)]
am
208c465f: am
b01233f2: am
a0eb50ac: resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
* commit '
208c465f056b71784a090a0485bbd235cad81224':
Colin Cross [Mon, 12 May 2014 23:26:32 +0000 (23:26 +0000)]
Ying Wang [Mon, 12 May 2014 23:26:31 +0000 (23:26 +0000)]
am
01d8b2aa: am
1fd8265d: am
1e8fec5b: am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
01d8b2aa978ea99e568b4869da389f9a01a76c2a':
Colin Cross [Mon, 12 May 2014 23:26:30 +0000 (23:26 +0000)]
am
581f49a4: am
25d84aa3: am
4048cf3a: am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
581f49a48cceb0a9c70b664d20d7ad2cd9d6eae5':
Colin Cross [Mon, 12 May 2014 23:26:29 +0000 (23:26 +0000)]
am
e6e26a21: am
59dc65a2: am
481fed17: am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
e6e26a216cd69118e968d90f95d9d77ca9cd16aa':
Ying Wang [Mon, 12 May 2014 23:26:28 +0000 (23:26 +0000)]
Colin Cross [Mon, 12 May 2014 23:26:27 +0000 (23:26 +0000)]
am
d1b45a73: am
84a20ac1: am
2c32144b: resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
* commit '
d1b45a736c7843e355261ef5bfb8c75b87a77f31':
Ying Wang [Mon, 12 May 2014 23:26:26 +0000 (23:26 +0000)]
am
63924664: am
0a60bdf5: am
0b7197a6: am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
63924664ad70a38e0c79081fd17a1ab328f577ef':
Ying Wang [Mon, 12 May 2014 23:26:25 +0000 (23:26 +0000)]
am
696e0c25: am
53d2ca07: am
4170e2be: am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
696e0c2559b84d8b9b7ff1b46c239deac757d0da':
Ying Wang [Mon, 12 May 2014 23:26:24 +0000 (23:26 +0000)]
am
0fcd51cf: am
3afdef2e: am
ca23f57c: am
de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate mes
* commit '
0fcd51cfcc65c67708247785f0694e1085c5ac0b':
Ying Wang [Mon, 12 May 2014 23:26:22 +0000 (23:26 +0000)]
am
2c20a0cb: am
e6a65a5f: resolved conflicts for merge of
b6d53f0b to master
* commit '
2c20a0cb3b4cc8c4e8eeb4c6843a0ba5905a08eb':
Ying Wang [Mon, 12 May 2014 23:26:21 +0000 (23:26 +0000)]
am
b75228fd: am
6336d6bf: am
1968f286: am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
b75228fdeac92eaaf4ebaf4a9ef48b8af4224c6d':
Elliott Hughes [Mon, 12 May 2014 23:26:20 +0000 (23:26 +0000)]
Scott Main [Mon, 12 May 2014 23:26:19 +0000 (23:26 +0000)]
am
927ae12c: am
3634c0df: am
0ed897d0: am
83aeb2f9: am
e2652df8: am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
927ae12cc82903b31509026f9f469719c5aee947':
Colin Cross [Mon, 12 May 2014 23:26:18 +0000 (23:26 +0000)]
am
1d94fe58: am
ce04c505: am
d121d417: am
90ed06ef: Merge "fix 2nd target clang prebuilt paths"
* commit '
1d94fe58165492fe1e496f12f27b66b1d75bd77f':
Ying Wang [Mon, 12 May 2014 23:26:17 +0000 (23:26 +0000)]
am
801fdba5: am
1eba3c14: am
484c7dec: am
ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '
801fdba53c6099762ac29c50e33aa9c4fb6fd87b':
Justin Koh [Mon, 12 May 2014 23:26:16 +0000 (23:26 +0000)]
am
b8ea99c3: am
f26c96ed: resolved conflicts for merge of
34cb6460 to master
* commit '
b8ea99c378270c8384b6be2d5732828981aaf671':
Steve Moyer [Mon, 12 May 2014 23:26:11 +0000 (23:26 +0000)]
am
9e3586dc: am
60250d42: Merge "Adding SmsTest to sdk build"
* commit '
9e3586dce6f02f21435390eb98e68126f7c81e3f':
Dianne Hackborn [Mon, 12 May 2014 23:26:08 +0000 (23:26 +0000)]
am
6a03bf2e: am
fc021daa: Fix issue #
12939338: Android version showing as \'KKWT\'
* commit '
6a03bf2e7ef8b4e6e3ae35bf8cfa85ea25e56226':
David 'Digit' Turner [Mon, 12 May 2014 23:26:07 +0000 (23:26 +0000)]
am
4fa29bd5: am
35cfe9e8: am
cc57457c: am
145562fc: Merge "Add missing font files to SDK system images."
* commit '
4fa29bd504e39936a0ba5e746e24b7111058ec9a':
Ying Wang [Mon, 12 May 2014 23:26:06 +0000 (23:26 +0000)]
am
93f59716: am
a87489b5: am
74b71317: am
2d72094f: am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
93f5971663ad9d17994605a1851355fa6005dd29':
Ben Cheng [Mon, 12 May 2014 23:26:05 +0000 (23:26 +0000)]
am
1c9537e1: am
2ad7d4df: am
7495e68a: am
6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '
1c9537e16de86a6509c1fee812da9400a146dd14':
Ying Wang [Mon, 12 May 2014 23:26:04 +0000 (23:26 +0000)]
am
faf41d0b: am
956cd054: am
34afc565: am
5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '
faf41d0bbbd02703579fa66150246bb8d40d92f2':
Ying Wang [Mon, 12 May 2014 23:26:02 +0000 (23:26 +0000)]
am
b5c7be29: am
30d8e12c: resolved conflicts for merge of
d616a73d to master
* commit '
b5c7be29701649567a61a7cf0569eeea904b9d8e':
Colin Cross [Mon, 12 May 2014 23:26:01 +0000 (23:26 +0000)]
am
ec462dbf: am
e3ae5a46: am
ddd7c919: am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
ec462dbfa9d3aeeadbbe1fbf209e4ef32133baa1':
Elliott Hughes [Mon, 12 May 2014 23:26:00 +0000 (23:26 +0000)]
am
b8995098: am
3e3cde55: am
4d5fa510: am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
b899509840ab17dafa0070c3e81b6ca6f5d41dc6':
Elliott Hughes [Mon, 12 May 2014 23:25:59 +0000 (23:25 +0000)]
Ying Wang [Mon, 12 May 2014 23:25:58 +0000 (23:25 +0000)]
am
387a095f: am
dd22aee1: am
69c3f457: am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
387a095fbd3c375e93c1c77c974f7bbe462933a6':
Andreas Huber [Mon, 12 May 2014 23:25:56 +0000 (23:25 +0000)]
am
5f4eb0c2: am
a42d3a48: fix the build, libstagefright_chromium_http is no longer needed.
* commit '
5f4eb0c2eb7ccd2fae4679b1129204129343afb9':
Christopher Ferris [Mon, 12 May 2014 23:25:55 +0000 (23:25 +0000)]
am
cebcb8b0: am
5d8ee715: am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
cebcb8b0473596515d53ec0ce39b390a61c10c1e':
Colin Cross [Mon, 12 May 2014 23:25:54 +0000 (23:25 +0000)]
Colin Cross [Mon, 12 May 2014 23:25:53 +0000 (23:25 +0000)]
am
f92f0c32: am
96870b3e: am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
f92f0c3295677494e2f1fae2c345c1a9c5e022db':
Ying Wang [Mon, 12 May 2014 23:25:52 +0000 (23:25 +0000)]
Ying Wang [Mon, 12 May 2014 23:25:51 +0000 (23:25 +0000)]
Adam Lesinski [Mon, 12 May 2014 23:25:50 +0000 (23:25 +0000)]
am
3b253928: am
9cee77b3: am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
3b2539286fbad59d999c8d2bd3ba65142bc01bac':
Justin Koh [Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)]
am
c94a531b: am
19753f45: am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
c94a531b086aed89fd90c12d9ec8a722c156b4e3':
Doug Zongker [Mon, 12 May 2014 23:25:48 +0000 (23:25 +0000)]
Doug Zongker [Mon, 12 May 2014 23:25:47 +0000 (23:25 +0000)]
am
315af55b: am
c9253822: add recovery update code to system images
* commit '
315af55b4a08bc8b17897ef230cd631d083aafb6':
Tim Murray [Mon, 12 May 2014 23:25:46 +0000 (23:25 +0000)]
am
17385d47: am
e858190f: am
47f9b9bc: am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
17385d47c7538e13c08da6e50512f83be562f02a':
Ying Wang [Mon, 12 May 2014 23:25:45 +0000 (23:25 +0000)]
am
fd0519b9: am
8647c336: am
1446cf93: am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
fd0519b95982c7fbfdc73432aeb6ab0505d53184':
Ying Wang [Mon, 12 May 2014 23:25:44 +0000 (23:25 +0000)]
am
fc830182: am
fc330375: Dedup the targets and dependencies of required modules.
* commit '
fc83018213ce28d5deebb5f7da7e5a2256f6b840':
Noreen Tolland [Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)]
am
b164425a: (-s ours) am
d76bb175: am
4b69be27: (-s ours) am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
b164425a49dcd5adda308ce5c7212f0ee83f9e7c':
Ben Cheng [Mon, 12 May 2014 23:25:42 +0000 (23:25 +0000)]
Brian Carlstrom [Mon, 12 May 2014 23:25:40 +0000 (23:25 +0000)]
Brian Carlstrom [Mon, 12 May 2014 23:25:39 +0000 (23:25 +0000)]
am
966e0fff: am
5b40a0bd: am
a15fc8fd: am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
966e0fff74dbb311a913b4ce41a79685b26c1783':
Brian Carlstrom [Mon, 12 May 2014 23:25:37 +0000 (23:25 +0000)]
am
902e09d4: resolved conflicts for merge of
966611a9 to master-nova
* commit '
902e09d43a6c6f9db6b4db4145fdea8b757be05f':
Ian Rogers [Mon, 12 May 2014 23:25:36 +0000 (23:25 +0000)]
am
ff8048bc: am
69968b8c: am
1fee45f1: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
ff8048bc48a8d7987a7bc1e37f49089fa9104b60':
Narayan Kamath [Mon, 12 May 2014 23:25:35 +0000 (23:25 +0000)]
am
5694cf61: am
7201cdef: am
b1aec05a: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
5694cf6125fab10189595849b163048014970dc0':
Colin Cross [Mon, 12 May 2014 23:25:34 +0000 (23:25 +0000)]
am
1576913e: am
8c28b594: am
6a7699d5: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
1576913e4ba45c896ee77c18dbd9717c357e0e7e':
Colin Cross [Mon, 12 May 2014 23:25:33 +0000 (23:25 +0000)]
am
f8dab51e: am
92ef2b3d: am
df313a04: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
f8dab51e2e2afcb869226f8d903ee36dfc4a3a81':
Ian Rogers [Mon, 12 May 2014 23:25:32 +0000 (23:25 +0000)]
am
1c56e680: am
0e0b880c: am
eb02fa0a: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
1c56e68023f67af685c8c781dece48a1dd061aab':
Brian Carlstrom [Mon, 12 May 2014 23:25:30 +0000 (23:25 +0000)]
am
deae4658: am
8bc31b6d: am
d4e29f52: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
deae46587ab041f413ae41ff3138b836decbd4c4':
Nick Vaccaro [Mon, 12 May 2014 23:25:29 +0000 (23:25 +0000)]
am
6a53c91a: am
2422e761: am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
6a53c91a01186ac3a5b0dc980c36a29bd0917b45':
Baligh Uddin [Mon, 12 May 2014 23:25:28 +0000 (23:25 +0000)]
am
efa671d2: Add the Telecomm entry in core.mk
* commit '
efa671d2fd17280d096d914e492dd25db114c787':
Add the Telecomm entry in core.mk
Santos Cordon [Mon, 12 May 2014 23:25:27 +0000 (23:25 +0000)]
am
6440470b: Adding telecomm to build src path for framework.
* commit '
6440470b5ed748cf1c30ecbda7877d08b7a778f4':
Adding telecomm to build src path for framework.
Ed Heyl [Mon, 12 May 2014 23:25:26 +0000 (23:25 +0000)]
Ian Rogers [Mon, 12 May 2014 23:18:13 +0000 (23:18 +0000)]
am
d671e2ac: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
d671e2ac95b74d3d43aadec2aa7315f88a0cfe14':
Narayan Kamath [Mon, 12 May 2014 23:18:12 +0000 (23:18 +0000)]
am
d514cf04: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
d514cf041da3de6c5ed7b3a1db8c889598d38722':
Colin Cross [Mon, 12 May 2014 23:18:11 +0000 (23:18 +0000)]
am
f0ae01a6: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
f0ae01a66b20e56fff778eea9aeb6681a883152d':
Colin Cross [Mon, 12 May 2014 23:18:10 +0000 (23:18 +0000)]
am
f0a420cb: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
f0a420cbebd6c046acb1bfed0054ca6cbfa453de':
Ian Rogers [Mon, 12 May 2014 23:18:09 +0000 (23:18 +0000)]
am
de353dae: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
de353dae2ede9e76d9e9cb961632170ff883c0a0':
Brian Carlstrom [Mon, 12 May 2014 23:18:08 +0000 (23:18 +0000)]
am
2364e309: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
2364e309768c9c2aaee2717d9c9127d3af0b134b':
Nick Vaccaro [Mon, 12 May 2014 23:18:07 +0000 (23:18 +0000)]
am
572041e6: am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
572041e6d083f9eb056d91ae139fdde4b1162716':
Ian Rogers [Mon, 12 May 2014 23:09:00 +0000 (23:09 +0000)]
am
8c6360e6: am
50912342: am
f544a5f4: Merge "Place ISA in ART boot image name."
* commit '
8c6360e62cf7cd2e64098373f13094d4bfb33cd5':
Place ISA in ART boot image name.
Ian Rogers [Mon, 12 May 2014 23:04:31 +0000 (23:04 +0000)]
am
50912342: am
f544a5f4: Merge "Place ISA in ART boot image name."
* commit '
50912342f10e769f17b9ea0e2174633af6f95cd3':
Place ISA in ART boot image name.
Ian Rogers [Mon, 12 May 2014 23:00:45 +0000 (23:00 +0000)]
am
f544a5f4: Merge "Place ISA in ART boot image name."
* commit '
f544a5f4d57750b569333a59d57f568121f6f4a3':
Place ISA in ART boot image name.
Ian Rogers [Mon, 12 May 2014 22:45:54 +0000 (22:45 +0000)]
Merge "Place ISA in ART boot image name."
Doug Zongker [Mon, 12 May 2014 22:32:20 +0000 (15:32 -0700)]
improve density selection of recovery assets
Some recovery UI assets are available in different sizes; we need to
pick the right ones for the device's density. Use
PRODUCT_AAPT_PREF_CONFIG if it is available (it is empty for older
devices), and fall back to the highest density in PRODUCT_AAPT_CONFIG
if the PREF_ version is not available.
Change-Id: Ia1eb7d5409cda17b0fc5c0bcfc33dfa6a50893e8
Ian Rogers [Sat, 10 May 2014 00:11:49 +0000 (17:11 -0700)]
Place ISA in ART boot image name.
Depends upon:
https://android-review.googlesource.com/#/c/94096/2
Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
Adam Lesinski [Mon, 12 May 2014 18:12:39 +0000 (18:12 +0000)]
Merge "Change aapt flag to use new name"
Ying Wang [Mon, 12 May 2014 17:02:28 +0000 (17:02 +0000)]
am
66f2af4e: am
6c432940: am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
66f2af4e555a3627285fb969ec0a8dc28d326830':
executable_prefer_symlink: add makefile for creating symlink to prefer version
Geremy Condra [Mon, 12 May 2014 17:00:58 +0000 (17:00 +0000)]
Merge "Add verity support to `make dist`."
Ying Wang [Mon, 12 May 2014 16:57:42 +0000 (16:57 +0000)]
am
6c432940: am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
6c432940599d5f5d3d11a26f12342845433f0a98':
executable_prefer_symlink: add makefile for creating symlink to prefer version
Ying Wang [Mon, 12 May 2014 16:53:01 +0000 (16:53 +0000)]
am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
dcdc985c47338c29e66a22941904abd4171607c9':
executable_prefer_symlink: add makefile for creating symlink to prefer version
Ying Wang [Mon, 12 May 2014 16:49:15 +0000 (16:49 +0000)]
Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
David 'Digit' Turner [Sun, 11 May 2014 09:28:16 +0000 (09:28 +0000)]
am
873782cc: am
9e3259f5: am
fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '
873782ccd44349c766f5d74e65b3b323618dd6ed':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
David 'Digit' Turner [Sun, 11 May 2014 09:23:35 +0000 (09:23 +0000)]
am
9e3259f5: am
fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '
9e3259f50d6aa2ca4430430d71d2fffd58662650':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
David 'Digit' Turner [Sun, 11 May 2014 09:19:43 +0000 (09:19 +0000)]
am
fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '
fb67f05d3d6deb2400fd09390550a7858a3c3158':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
David 'Digit' Turner [Sun, 11 May 2014 09:16:15 +0000 (09:16 +0000)]
Merge changes I53b2ada9,I30794ea5
* changes:
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
Geremy Condra [Tue, 6 May 2014 05:19:37 +0000 (22:19 -0700)]
Add verity support to `make dist`.
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
Scott Main [Sat, 10 May 2014 00:23:05 +0000 (00:23 +0000)]
am
17b3567b: am
e4af3b35: am
18ba007b: am
7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav
* commit '
17b3567b064fa8d8637113c49014494e25241aa6':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Sat, 10 May 2014 00:18:17 +0000 (00:18 +0000)]
am
e4af3b35: am
18ba007b: am
7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the he
* commit '
e4af3b35588932d9f14eacaee783bb6fcff0d72b':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Sat, 10 May 2014 00:13:27 +0000 (00:13 +0000)]
am
18ba007b: am
7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is
* commit '
18ba007b371478254faa43f563ee28295e7d742d':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Sat, 10 May 2014 00:09:02 +0000 (00:09 +0000)]
am
7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the
* commit '
7a6ab434bc34319f06818d12d3abaf9070630684':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Michael Runge [Fri, 9 May 2014 21:14:42 +0000 (14:14 -0700)]
Add missing quotation mark in assertion
Change-Id: I3e76997fe257bfccb7d61dcc1273e014cdb55a41
Doug Zongker [Fri, 9 May 2014 20:15:01 +0000 (13:15 -0700)]
fix ota script to generate non-block commands correctly
If you had a target_files without a recovery patch and specified
--block (which should have no effect without a patch), it would have
omitted some necessary commands from the OTA script.
Change-Id: I96e79cd561ebf09cfe53792d1cc558cc71479869
Scott Main [Fri, 9 May 2014 17:00:14 +0000 (10:00 -0700)]
update wear header template to support sticky nav.
moved the search and menu markup for the header into a method call.
also update the styles and script so that when a page does not belong
to a primary horizontal-nav link, the header logo is used for the breadcrumb's
first link and text.
Change-Id: I14129fe7657924e2037c103674e09322c4c31db8
Adam Lesinski [Fri, 9 May 2014 17:57:48 +0000 (10:57 -0700)]
Change aapt flag to use new name
Change-Id: I59ee77ede4716fdbf8403504da65fcadc9946423
Doug Zongker [Fri, 9 May 2014 17:44:16 +0000 (17:44 +0000)]
Merge "assert recovery finger/thumbprints, not system"
Andrew Hsieh [Fri, 9 May 2014 17:06:54 +0000 (17:06 +0000)]
am
a01cb054: am
c581e10a: am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
a01cb05450c6435c9cdca58534ed00eafb07f6eb':
Disable canonical prefixes of system headers
Andrew Hsieh [Fri, 9 May 2014 17:02:10 +0000 (17:02 +0000)]
am
c581e10a: am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
c581e10a2b6f54e6f6b24dbd3e5fb10cdf3c77eb':
Disable canonical prefixes of system headers
Andrew Hsieh [Fri, 9 May 2014 16:59:04 +0000 (16:59 +0000)]
am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
eca0043b869cb10792e2f3e79d4714bde2945bac':
Disable canonical prefixes of system headers
Andrew Hsieh [Fri, 9 May 2014 16:55:00 +0000 (16:55 +0000)]
Merge "Disable canonical prefixes of system headers"
Ying Wang [Fri, 9 May 2014 16:54:38 +0000 (16:54 +0000)]
am
96e487b2: am
98892291: am
3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '
96e487b262c2d5d7c02d49e29e71895588e15549':
javac: rename common_flags to avoid conflictions