OSDN Git Service
Greg Hackmann [Mon, 12 May 2014 23:28:49 +0000 (23:28 +0000)]
Ying Wang [Mon, 12 May 2014 23:28:48 +0000 (23:28 +0000)]
Scott Main [Mon, 12 May 2014 23:28:47 +0000 (23:28 +0000)]
Dianne Hackborn [Mon, 12 May 2014 23:28:46 +0000 (23:28 +0000)]
Andrew Hsieh [Mon, 12 May 2014 23:28:45 +0000 (23:28 +0000)]
am
dee66b44: am
96000a61: am
314b5c98: am
66a4ef8f: am
d14f3cc7: am
5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit '
dee66b44dfc8ad3fdb345f3833281d9a665f9266':
Eric Laurent [Mon, 12 May 2014 23:28:44 +0000 (23:28 +0000)]
am
2fba078b: am
2044c092: Merge "move audio policy service to a separate library"
* commit '
2fba078bbf0db4dd8c13670a9c44181b0e089108':
Ying Wang [Mon, 12 May 2014 23:28:43 +0000 (23:28 +0000)]
Colin Cross [Mon, 12 May 2014 23:28:42 +0000 (23:28 +0000)]
am
40ced75f: am
0af8bc1e: am
c48da22b: am
8213b719: am
6e92ade0: am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
40ced75f352fc634a94acdd414d86ab573b1102d':
Andrew Hsieh [Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)]
Hui Shu [Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)]
Narayan Kamath [Mon, 12 May 2014 23:28:40 +0000 (23:28 +0000)]
am
8b4f66c5: am
70df4dc5: am
2c852c33: am
f262d87f: am
237f5414: am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
8b4f66c527d1a8b48aae8b4119fb44ba27e8ccd1':
Hui Shu [Mon, 12 May 2014 23:28:39 +0000 (23:28 +0000)]
Hui Shu [Mon, 12 May 2014 23:28:38 +0000 (23:28 +0000)]
am
6ec44457: am
749aee5f: Merge "Add removed.txt for doclava api consistency check"
* commit '
6ec44457d369b5ade4c92ee9cb8cbec202ee55a6':
Narayan Kamath [Mon, 12 May 2014 23:28:37 +0000 (23:28 +0000)]
am
cb7e0108: am
a813b735: am
e00d0e7c: am
f6869e25: am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
cb7e0108a1f2460fcf96f0516e730cf4b8312343':
Dmitriy Ivanov [Mon, 12 May 2014 23:28:36 +0000 (23:28 +0000)]
Andrew Hsieh [Mon, 12 May 2014 23:28:35 +0000 (23:28 +0000)]
am
44c4de3a: am
d7ef5b3a: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
44c4de3ac61205d077e28705b68fe971346b7de5':
Andy McFadden [Mon, 12 May 2014 23:28:34 +0000 (23:28 +0000)]
Ying Wang [Mon, 12 May 2014 23:28:32 +0000 (23:28 +0000)]
am
39b332ca: am
df925cef: am
f91a014f: am
0a196075: am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
39b332cab33a830f8199043d81b0f6ee4d5a62bd':
Ian Rogers [Mon, 12 May 2014 23:28:30 +0000 (23:28 +0000)]
am
4d47ddcb: am
67d675af: am
d5cd41fe: am
95739176: am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
4d47ddcb5964f9976614df44c84e7eaf7ea56a86':
Ian Rogers [Mon, 12 May 2014 23:28:29 +0000 (23:28 +0000)]
am
8405d264: am
17fe9e30: am
17536801: am
e25c0b25: am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
8405d264fd8898dc3092f59991d7e88bd7a9b447':
Ian Rogers [Mon, 12 May 2014 23:28:28 +0000 (23:28 +0000)]
am
ea08df3c: am
368790a7: am
4d16757b: am
848361f9: am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
ea08df3c1395c61392547895cc053b82fdfaa6a7':
Ying Wang [Mon, 12 May 2014 23:28:27 +0000 (23:28 +0000)]
am
0a09eb71: am
b5e18648: am
1409fb95: am
76704158: am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
0a09eb71fa34cfb7455b3e38aed90b1ad13a95ad':
Clay Murphy [Mon, 12 May 2014 23:28:26 +0000 (23:28 +0000)]
am
af864260: am
7507d03f: am
e07f513b: am
04a68914: am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
af8642606a93b115cb87d346968c9a26de288b56':
Adam Hampson [Mon, 12 May 2014 23:28:25 +0000 (23:28 +0000)]
Chris Wren [Mon, 12 May 2014 23:28:24 +0000 (23:28 +0000)]
am
4097389c: am
d30905ca: Merge "jdk error message should not mention the version"
* commit '
4097389cc3a731468fb3c081f10856089746f441':
Ben Cheng [Mon, 12 May 2014 23:28:23 +0000 (23:28 +0000)]
Doug Zongker [Mon, 12 May 2014 23:28:22 +0000 (23:28 +0000)]
am
dfee242a: am
2a992399: Merge "test block system image patch at build time"
* commit '
dfee242af5d462014807436e9b4bc0bd6d5cfc20':
Dianne Hackborn [Mon, 12 May 2014 23:28:21 +0000 (23:28 +0000)]
Nicolas Geoffray [Mon, 12 May 2014 23:28:20 +0000 (23:28 +0000)]
am
fdd87421: am
a6edb7a0: am
769a191f: am
50fcf753: am
db48d145: am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
fdd874215b8d7890d1559ae0c726593d57f8c5b6':
Doug Zongker [Mon, 12 May 2014 23:28:19 +0000 (23:28 +0000)]
am
7a496e7c: am
1b33ff33: Merge "move data wipe to end of OTA package"
* commit '
7a496e7c5b6250b14b1f95db7f9bbcd67b38c10b':
Nicolas Geoffray [Mon, 12 May 2014 23:28:18 +0000 (23:28 +0000)]
am
cab0311b: am
ce968e66: am
22130e8f: am
3f5cc08d: am
b11697d3: am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
cab0311b23b3b92cf0b23911cc36f8202303c8ee':
Doug Zongker [Mon, 12 May 2014 23:28:17 +0000 (23:28 +0000)]
am
11bd5e42: am
5c62321c: Merge "handle don\'t care regions in the system image"
* commit '
11bd5e42191b21ae9c97adfb27c8bd9ba4308365':
Andrew Hsieh [Mon, 12 May 2014 23:28:14 +0000 (23:28 +0000)]
am
7c4845e1: am
dc7e26d2: am
887a76fa: am
1537f8bf: am
12493c89: am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
7c4845e13514e9259af81672251d81f083f405b3':
Victoria Lease [Mon, 12 May 2014 23:28:13 +0000 (23:28 +0000)]
am
3b6afc66: am
c9b7f3d6: am
3c14d21a: am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
3b6afc66d0f66703a43a4732e93614a371ab7175':
Doug Zongker [Mon, 12 May 2014 23:28:12 +0000 (23:28 +0000)]
am
cde518e2: am
7676dbe0: Merge "add option to specify updater binary, for development"
* commit '
cde518e2c3318d840bc7b6c4c2c0f54881163cd3':
Colin Cross [Mon, 12 May 2014 23:28:11 +0000 (23:28 +0000)]
Nicolas Geoffray [Mon, 12 May 2014 23:28:10 +0000 (23:28 +0000)]
am
4efdecdb: am
b19e62b3: am
77d4e8ed: am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
4efdecdb446d571ebc931aa8ad1f1cf66e8e1144':
Primiano Tucci [Mon, 12 May 2014 23:28:09 +0000 (23:28 +0000)]
am
149367c7: am
36ac26a0: am
573eb55d: am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
149367c7711bde4de5d04b2daca1176590f6bdc2':
Narayan Kamath [Mon, 12 May 2014 23:28:09 +0000 (23:28 +0000)]
am
3bfc0548: am
0fe8eac2: am
05e89b22: am
3246d88d: resolved conflicts for merge of
e8bb5c3a to klp-modular-dev-plus-aosp
* commit '
3bfc0548588c9908470115a9a979ce5d5679eac7':
Ying Wang [Mon, 12 May 2014 23:28:08 +0000 (23:28 +0000)]
am
a60f06d3: am
3bbfddd2: Revert "Fix build: Revert "Try to catch more misuse of .""
* commit '
a60f06d39cc8c976d6d55ba95d399f20b6653419':
Ed Heyl [Mon, 12 May 2014 23:28:07 +0000 (23:28 +0000)]
am
72cb1726: am
4f6e8342: Fix build: Revert "Try to catch more misuse of ."
* commit '
72cb172666e6640e33effd4cf91ee74282229b76':
Ying Wang [Mon, 12 May 2014 23:28:06 +0000 (23:28 +0000)]
Ben Cheng [Mon, 12 May 2014 23:28:05 +0000 (23:28 +0000)]
am
27747ed2: am
8795fdba: am
c42a7a34: am
cc45c60c: am
d86da81f: am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
27747ed2cffbc5702ab9b96974787c9b92d60285':
Griff Hazen [Mon, 12 May 2014 23:28:04 +0000 (23:28 +0000)]
am
5e2c68c5: am
b1f43648: am
d3b40d52: am
6c23e7b8: am
433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '
5e2c68c519645718316d1a1bf01b0f852dd15f04':
Derek Sollenberger [Mon, 12 May 2014 23:28:03 +0000 (23:28 +0000)]
am
bfae30c4: am
2284a1c0: Merge "Remove global Skia includes and associated shortcuts."
* commit '
bfae30c4e5ee0c7f5afe5fb5b05ade8c87abc2d5':
Ying Wang [Mon, 12 May 2014 23:27:55 +0000 (23:27 +0000)]
Ying Wang [Mon, 12 May 2014 23:27:54 +0000 (23:27 +0000)]
JP Abgrall [Mon, 12 May 2014 23:27:53 +0000 (23:27 +0000)]
am
f859eae6: (-s ours) am
6fd1eea0: am
4086cc6b: (-s ours) am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
f859eae6d8aad3bdd7197eaabdc1804f0e352d7a':
Ying Wang [Mon, 12 May 2014 23:27:52 +0000 (23:27 +0000)]
am
7bdca9af: am
2fa191d7: am
3fd8a4fe: am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
7bdca9affd174a310de0ff39ec2a257fde55d832':
Mark Salyzyn [Mon, 12 May 2014 23:27:51 +0000 (23:27 +0000)]
JP Abgrall [Mon, 12 May 2014 23:27:50 +0000 (23:27 +0000)]
am
537b6549: (-s ours) am
ff23e760: am
46335a65: (-s ours) am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
537b654986afb1eed366d9384e0d77cc01e1eaca':
Ying Wang [Mon, 12 May 2014 23:27:49 +0000 (23:27 +0000)]
am
0fa32645: am
70543d37: am
f7d12336: am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
0fa32645f81e123de6ca368f4b2543ef8c86d757':
Ying Wang [Mon, 12 May 2014 23:27:48 +0000 (23:27 +0000)]
am
a03892f4: am
4c285735: am
3156d4c4: am
45bde7bf: am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
a03892f4f036bbc92c57e30f7d5146fa12f7280c':
Nick Kralevich [Mon, 12 May 2014 23:27:47 +0000 (23:27 +0000)]
am
65a088a7: am
8e6f18d7: am
e9513f95: am
65f26a76: am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
65a088a75cb0149d74131d7947662df34e25f71d':
Ying Wang [Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)]
am
6a37681b: am
557282db: am
332bbced: am
a8d273d3: am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
6a37681b7bb4ef2eb85ca11b6d98b5936c259da3':
Torne (Richard Coles) [Mon, 12 May 2014 23:27:45 +0000 (23:27 +0000)]
am
0d9bb26c: am
62e30dcf: am
64cd1218: am
e665992c: am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
0d9bb26c88e56057979da07a4ffb55eb6f8cafb6':
Ying Wang [Mon, 12 May 2014 23:27:44 +0000 (23:27 +0000)]
am
cf037970: am
33fb2093: am
948c22b4: am
2aeff455: am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
cf0379704483c80584c2687fbf55fd1a05924143':
Elliott Hughes [Mon, 12 May 2014 23:27:43 +0000 (23:27 +0000)]
am
2241d156: am
eab6de4e: am
1615a101: am
4a122c96: am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
2241d1564f408594f9162744138114d40a5edc42':
Ying Wang [Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)]
am
af93f558: am
a914a0d7: am
08842ae7: am
12c909b2: resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
* commit '
af93f5585e2301b1828874d1abef94e521119379':
Elliott Hughes [Mon, 12 May 2014 23:27:30 +0000 (23:27 +0000)]
am
2f59df65: am
9a1a9331: am
9f3e1d78: am
331272f9: am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
2f59df656662c86e380b19fab32e5bb5f04a7347':
Ying Wang [Mon, 12 May 2014 23:27:29 +0000 (23:27 +0000)]
am
859e37ef: am
aeab26e9: am
31dab4c4: am
4a0b06e8: am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
859e37ef957f8c97cb23bdec75213945033d80fe':
Nick Kralevich [Mon, 12 May 2014 23:27:28 +0000 (23:27 +0000)]
am
91a8c1cc: am
b4f4dc96: am
61b71bb2: am
b8d792d7: am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
91a8c1cc7ff23040d784dfd2f5054e86ee2c2bd5':
Ying Wang [Mon, 12 May 2014 23:27:27 +0000 (23:27 +0000)]
am
2c7e8ce5: am
2bc6328f: am
ead8944e: Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
* commit '
2c7e8ce5aecf72d5971e8eb1dc649ad4ebc2fd02':
Tsu Chiang Chuang [Mon, 12 May 2014 23:27:21 +0000 (23:27 +0000)]
am
603fc3af: am
43d52485: add exception to be able to build emulator_tests in conjunction with the sdk.
* commit '
603fc3af00cb68b439df01db89a92298ab9aa967':
Nicolas Prevot [Mon, 12 May 2014 23:27:19 +0000 (23:27 +0000)]
am
b4b81dc6: am
c1b2536f: Making ManagedProvisioning present in all phones/tablets.
* commit '
b4b81dc631a658616e04e58755c7039858a858ec':
Ying Wang [Mon, 12 May 2014 23:27:18 +0000 (23:27 +0000)]
am
77eb2e9e: am
0fad5669: am
4a2e083f: am
0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"
* commit '
77eb2e9e87c78ebe794b01e6a9c4df3b1e58eb8a':
Ying Wang [Mon, 12 May 2014 23:27:17 +0000 (23:27 +0000)]
am
2f19f1a3: am
d4fe0bdf: am
9b996f80: am
eb9b62e0: Merge "Make -rpath-link work with multilib."
* commit '
2f19f1a30710c7ab02f80be2c5e41c45f6c87700':
Tim Murray [Mon, 12 May 2014 23:27:17 +0000 (23:27 +0000)]
am
02546dcf: am
25c67db7: am
64fa69d1: am
254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."
* commit '
02546dcf157474d5598db1754acc66f8d23da983':
Colin Cross [Mon, 12 May 2014 23:27:16 +0000 (23:27 +0000)]
Ying Wang [Mon, 12 May 2014 23:27:15 +0000 (23:27 +0000)]
am
506526f6: am
28edfe16: am
0c9c0bfc: am
9aadde67: Merge "Include in upper-level makefiles"
* commit '
506526f6fa0380b99d1f2bf9aa003a5c05cdc975':
Ying Wang [Mon, 12 May 2014 23:27:13 +0000 (23:27 +0000)]
Ying Wang [Mon, 12 May 2014 23:27:12 +0000 (23:27 +0000)]
Mark Salyzyn [Mon, 12 May 2014 23:27:09 +0000 (23:27 +0000)]
Doug Zongker [Mon, 12 May 2014 23:27:07 +0000 (23:27 +0000)]
am
c63ebd49: am
ae91ab79: Merge "add --block flag to ota_from_target_files"
* commit '
c63ebd49e1311f364c4eacc631f412153b555bf2':
Ying Wang [Mon, 12 May 2014 23:27:04 +0000 (23:27 +0000)]
Geremy Condra [Mon, 12 May 2014 23:27:02 +0000 (23:27 +0000)]
am
c92c8384: am
d75d7128: Merge "Add support for block incremental OTAs"
* commit '
c92c8384065bfadc6523f7acf910fea6a0b444d9':
Steve Moyer [Mon, 12 May 2014 23:27:00 +0000 (23:27 +0000)]
am
3026a603: am
ffe0beeb: Merge "Combine emulator test projects into a single apk"
* commit '
3026a6038b525a687a7a428f94c72a189235eb5e':
Doug Zongker [Mon, 12 May 2014 23:26:59 +0000 (23:26 +0000)]
am
4b95abc9: am
e3220585: img_from_target_files doesn\'t need releasetools extensions
* commit '
4b95abc964dc112b743367781117e9669af2c115':
Doug Zongker [Mon, 12 May 2014 23:26:58 +0000 (23:26 +0000)]
am
79bef9c5: am
4abfeaa3: Merge "rebuild recovery patch in sign_target_files_apks"
* commit '
79bef9c5ac0d045b0674e4daf0d9e8adf96a9ff4':
Ying Wang [Mon, 12 May 2014 23:26:57 +0000 (23:26 +0000)]
am
5e7cc1e7: am
3c5f698c: am
21ec64b1: am
5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
* commit '
5e7cc1e7cf8f3db11da785bc99de3b3a16e52e72':
Ying Wang [Mon, 12 May 2014 23:26:56 +0000 (23:26 +0000)]
Colin Cross [Mon, 12 May 2014 23:26:55 +0000 (23:26 +0000)]
Stephen Hines [Mon, 12 May 2014 23:26:54 +0000 (23:26 +0000)]
am
f5ebc164: am
a0d13d81: am
515f379f: am
f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit '
f5ebc164edf64e5b48caed61ac2effdf9ebf30a4':
Ying Wang [Mon, 12 May 2014 23:26:53 +0000 (23:26 +0000)]
am
b8c3f9a6: am
8918bf6f: am
f1339406: am
0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '
b8c3f9a667724135dc7d9caefc321bf06a286505':
Doug Zongker [Mon, 12 May 2014 23:26:52 +0000 (23:26 +0000)]
am
6fe36d91: am
211213f5: Merge "bump releasetools python requirement to 2.7"
* commit '
6fe36d91c82a7a3a94a3597b479e7023ebed4412':
Ying Wang [Mon, 12 May 2014 23:26:45 +0000 (23:26 +0000)]
am
f987dd22: am
6d5ca9f4: am
52cefc36: resolved conflicts for merge of
6ca56b6a to klp-modular-dev-plus-aosp
* commit '
f987dd22ead5bc4400fa3cb552b0034e0696605f':
Narayan Kamath [Mon, 12 May 2014 23:26:44 +0000 (23:26 +0000)]
Narayan Kamath [Mon, 12 May 2014 23:26:43 +0000 (23:26 +0000)]
am
1886cb5c: am
21f1d958: am
2a1a308f: (-s ours) am
70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '
1886cb5cb0c0d6ad3467fc769d302fadc902d82f':
Narayan Kamath [Mon, 12 May 2014 23:26:42 +0000 (23:26 +0000)]
am
6f980d49: am
7ad6f5f7: am
35513f4c: (-s ours) am
d4dc88b0: Merge "Adding apache-harmony to cts."
* commit '
6f980d4960009f0bd4002abe1b84e9e7efeddab1':
Narayan Kamath [Mon, 12 May 2014 23:26:41 +0000 (23:26 +0000)]
am
b016794c: am
129be820: am
6b835426: (-s ours) am
92e99b12: Merge "add jsr166 tests to cts. Bug:
10390711"
* commit '
b016794c22b4eff712ddd531a3d9149f9a695a9f':
Dirk Dougherty [Mon, 12 May 2014 23:26:40 +0000 (23:26 +0000)]
am
a5fd8060: am
5f977bb9: am
bdaf9012: am
98756f3b: am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
a5fd806093b4aad2abad6827b2ec16f13bd3b135':
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':