OSDN Git Service
Greg Hackmann [Mon, 12 May 2014 23:29:41 +0000 (23:29 +0000)]
am
40a198c6: am
b3f2dac1: am
0fd37501: am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
40a198c6f3ed230c7b89c8df5d58909705986129':
Colin Cross [Mon, 12 May 2014 23:29:40 +0000 (23:29 +0000)]
am
3a316e63: am
9871d2e2: am
0396b102: am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
3a316e63f2998be2b44cdbb15acc65d8d80d813a':
Torne (Richard Coles) [Mon, 12 May 2014 23:29:40 +0000 (23:29 +0000)]
am
cd6a2dd9: am
dc74b380: am
e4915bbe: am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
cd6a2dd91aa4ed31252e49c18c1bb149067f0b72':
Narayan Kamath [Mon, 12 May 2014 23:29:37 +0000 (23:29 +0000)]
am
07baf958: am
775da50d: am
bfc9b30d: (-s ours) am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
07baf95875d4a72f154908aa84fe1ea05a487882':
Narayan Kamath [Mon, 12 May 2014 23:29:36 +0000 (23:29 +0000)]
am
d1282ef5: am
797741ad: am
839d2829: (-s ours) am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
d1282ef5557d2c226a2235ff194de71aedb54872':
Narayan Kamath [Mon, 12 May 2014 23:29:35 +0000 (23:29 +0000)]
am
0919322d: am
1d671c23: am
823f0ba6: (-s ours) am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
0919322dad6b7744c2698b21badc9596f9008153':
Nicolas Geoffray [Mon, 12 May 2014 23:29:34 +0000 (23:29 +0000)]
am
fb5c7e58: am
108df578: am
7e28c074: am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
fb5c7e58149f6ff585e9c24c21942410cd866814':
Dmitriy Ivanov [Mon, 12 May 2014 23:29:32 +0000 (23:29 +0000)]
am
95c96c46: am
cc733968: am
7e739e54: am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
95c96c463f70bb709e46d523c3cf41dc0847ed6b':
Tim Murray [Mon, 12 May 2014 23:29:30 +0000 (23:29 +0000)]
am
849281e4: am
a6e629e8: am
7ebce18a: am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
849281e43ac9f93bd71d3ca82c4a9e5678275c49':
Brian Carlstrom [Mon, 12 May 2014 23:29:28 +0000 (23:29 +0000)]
am
944f3eef: am
4d864206: am
4888fe34: resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
* commit '
944f3eef9b46c7c0a5f905e4273206c47223ba4a':
Brian Carlstrom [Mon, 12 May 2014 23:29:27 +0000 (23:29 +0000)]
Narayan Kamath [Mon, 12 May 2014 23:29:26 +0000 (23:29 +0000)]
am
13185b8c: am
c54d7f21: am
b6cc8421: am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
13185b8ce7d0775d682fbf47ef1db583c6186974':
Ying Wang [Mon, 12 May 2014 23:29:25 +0000 (23:29 +0000)]
Ying Wang [Mon, 12 May 2014 23:29:24 +0000 (23:29 +0000)]
am
f596b187: am
710e0265: resolved conflicts for merge of
f966bda4 to master
* commit '
f596b1872acad07ee66b165b73f8dddd693994d7':
Christopher Ferris [Mon, 12 May 2014 23:29:23 +0000 (23:29 +0000)]
am
c888dbbd: am
707354c0: am
fc1a735e: am
2d0ecc1b: am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
c888dbbdb4312ec785855ee23e48d95a02f282c3':
Ying Wang [Mon, 12 May 2014 23:29:22 +0000 (23:29 +0000)]
am
18101975: am
82784b28: am
1758fe1f: am
30dbfa43: am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
181019753cb126134c173a5f097e5f6c050e245f':
Narayan Kamath [Mon, 12 May 2014 23:29:20 +0000 (23:29 +0000)]
am
7e600a32: am
b4d757b1: am
f6811abe: am
9fbd3afd: am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
7e600a32551427173d4d0c070028f69957230bd2':
Mathieu Chartier [Mon, 12 May 2014 23:29:19 +0000 (23:29 +0000)]
am
e56b9a8f: am
376c686d: am
7803fde3: am
baa8a1b3: am
1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit '
e56b9a8f57a56149929ffba1e7d2e42ceabea6c2':
Scott Main [Mon, 12 May 2014 23:29:18 +0000 (23:29 +0000)]
am
3e2bfef1: am
a1cda0e3: am
4a942fbb: am
35fcac0f: am
70c9c2d8: am
a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '
3e2bfef14cfb00baa88a5b4b6e689bcbdf17d6fc':
Ying Wang [Mon, 12 May 2014 23:29:17 +0000 (23:29 +0000)]
am
ca55d27e: am
d2c1f122: am
9efc18fb: am
da3eec42: am
708242d5: Merge "Increase the maximum javac heap size."
* commit '
ca55d27e3c28203ad994571c126bc07ee190113b':
Scott Main [Mon, 12 May 2014 23:29:16 +0000 (23:29 +0000)]
am
80700f21: am
7964804d: am
5429cdc2: am
bb3ed6fb: am
b8702917: am
75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit '
80700f21074ac5d8f524b695d96fde4d18ef0ab4':
Scott Main [Mon, 12 May 2014 23:29:16 +0000 (23:29 +0000)]
am
e54c6645: am
4f311964: am
9e81f2c2: am
97d326ea: am
514c8254: am
4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '
e54c6645314c2081cfb9916c3ef000427458e8fe':
Colin Cross [Mon, 12 May 2014 23:29:15 +0000 (23:29 +0000)]
am
5dde9123: am
6443630c: am
441e9452: resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
* commit '
5dde91231bd05821080b5bad60f337ab9368ec22':
Xavier Ducrohet [Mon, 12 May 2014 23:29:14 +0000 (23:29 +0000)]
am
56760822: am
86c0cf68: am
c8fea2ae: am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
56760822cbea6d5702901ca670ae37f129677d4b':
Geremy Condra [Mon, 12 May 2014 23:29:13 +0000 (23:29 +0000)]
am
89c78d35: am
9a6e8764: Merge "Add the verity key to the verity dependencies."
* commit '
89c78d357a9a620a2197ef2e6eccc14fa7fb61a7':
Adam Lesinski [Mon, 12 May 2014 23:29:12 +0000 (23:29 +0000)]
am
cc8bb17e: am
9d9dbaba: Merge "Temporarily use a separate var for including shared resources"
* commit '
cc8bb17e208a87e54aac8aadc5a7f072269969b6':
Colin Cross [Mon, 12 May 2014 23:29:11 +0000 (23:29 +0000)]
Ying Wang [Mon, 12 May 2014 23:29:10 +0000 (23:29 +0000)]
am
43759571: am
dbe23f5d: Set up dependency of resource_export_package
* commit '
43759571d7f7334eab5040b698035f3ae5474060':
Ricardo Cervera [Mon, 12 May 2014 23:29:09 +0000 (23:29 +0000)]
am
8ce0e540: am
ab589ea6: am
27de0f14: am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
8ce0e540c818c80f3fb93c1053f2b413ffe5370f':
Tim Murray [Mon, 12 May 2014 23:29:09 +0000 (23:29 +0000)]
am
46b5caa6: am
1bbba7d4: am
9c08a73b: am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
46b5caa6ed6aab011549fb8951e9cc6c2f5990c2':
Colin Cross [Mon, 12 May 2014 23:29:08 +0000 (23:29 +0000)]
am
f2d98e3f: am
9b269f22: am
3c1183a6: am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
f2d98e3f1cbfac67ca9957e4f0a110734e0f19a3':
Ying Wang [Mon, 12 May 2014 23:29:07 +0000 (23:29 +0000)]
am
615fd8c9: am
c63d345b: am
264a5ed3: am
711951ab: am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
615fd8c99153863f33bacb5f80b6cd8ce4c59e6b':
Adam Lesinski [Mon, 12 May 2014 23:29:06 +0000 (23:29 +0000)]
am
d7ac94c5: am
de057c30: Add LOCAL_APK_LIBRARIES to the AAPT -I flag
* commit '
d7ac94c5da380e2b9482031860a51b9c6aff381d':
Tim Kilbourn [Mon, 12 May 2014 23:29:05 +0000 (23:29 +0000)]
am
83a839d9: am
a5fdf90b: Merge "Add wifi-service to PRODUCT_PACKAGES."
* commit '
83a839d9459fbb9ab8b76ffc134f9eae008aa323':
Andrew Hsieh [Mon, 12 May 2014 23:29:04 +0000 (23:29 +0000)]
am
36db5b16: am
1477080e: am
cde91b3e: am
0adc6431: am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
36db5b1610a282b73884895360736f3442b35a5e':
Ying Wang [Mon, 12 May 2014 23:29:03 +0000 (23:29 +0000)]
am
f50d134c: am
595f996f: am
7a93f683: am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
f50d134c354dd09051d8640e4cff983e4e938654':
Colin Cross [Mon, 12 May 2014 23:29:02 +0000 (23:29 +0000)]
am
5a7f5b28: am
cf1f9d2d: fix bad merge conflict resolution
* commit '
5a7f5b2848c43dc27d7d5af9ecc3c156e6af5b43':
Colin Cross [Mon, 12 May 2014 23:29:01 +0000 (23:29 +0000)]
am
e31fb21d: am
f2b60c0f: resolved conflicts for merge of
f8e4d1b7 to master
* commit '
e31fb21d57768ea4d13b40b395f49d8fffa62b4f':
Adam Hampson [Mon, 12 May 2014 23:29:00 +0000 (23:29 +0000)]
am
0e71db32: am
e3290e9e: Merge "move libbcc from core_base to core_minimal"
* commit '
0e71db32b7368b269f452de54d7876e7c2acea23':
Lajos Molnar [Mon, 12 May 2014 23:29:00 +0000 (23:29 +0000)]
am
1e7688b0: am
3d402686: Merge "stagefright: use media_codecs_google*.xml files"
* commit '
1e7688b0b4b990aa337c68197ca0c5596d57c059':
Narayan Kamath [Mon, 12 May 2014 23:28:59 +0000 (23:28 +0000)]
am
5a08747f: am
9c2daa97: Merge "Add warning message for java6 builds."
* commit '
5a08747f4573d3a29d730e4932f042dbfbb247ca':
Colin Cross [Mon, 12 May 2014 23:28:58 +0000 (23:28 +0000)]
am
b325c565: am
58596266: am
e07f9225: am
7e998752: am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
b325c565daba3a1d2dea89daf74ec1fe8b1f3f8c':
Ying Wang [Mon, 12 May 2014 23:28:57 +0000 (23:28 +0000)]
am
0b59dbf8: am
81717cc2: am
84fbc7e8: am
996f3826: am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
0b59dbf8190c3c2a3ba78d40639fb2bb28b5ded3':
Ying Wang [Mon, 12 May 2014 23:28:56 +0000 (23:28 +0000)]
am
8988c93f: am
636dc20d: resolved conflicts for merge of
ad495272 to master
* commit '
8988c93f79d7bdc5d780d0e0a8ed5ae27468aab4':
Glenn Kasten [Mon, 12 May 2014 23:28:55 +0000 (23:28 +0000)]
am
94db7c36: am
99401496: am
9a3f4999: am
a7c9d15e: am
b614ef1e: am
cb902fff: Merge "A few other removals for the 64 bit blacklist."
* commit '
94db7c36be945e417993414d9ac6bc15f04b53ed':
Christopher Ferris [Mon, 12 May 2014 23:28:54 +0000 (23:28 +0000)]
am
7dd388f1: am
ddb9b404: am
10eaabfc: am
a908fc96: am
aea9f041: am
8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit '
7dd388f1ac491e99eba101a6f1cddb5fd788acb0':
Nick Kralevich [Mon, 12 May 2014 23:28:53 +0000 (23:28 +0000)]
am
97bc29b2: am
db17a9d0: am
77e63659: am
cea2ad87: am
e623b4c2: am
f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit '
97bc29b23925853444f2b3295c8ce60b44cebfcf':
Tim Kilbourn [Mon, 12 May 2014 23:28:52 +0000 (23:28 +0000)]
Ying Wang [Mon, 12 May 2014 23:28:51 +0000 (23:28 +0000)]
Geremy Condra [Mon, 12 May 2014 23:28:51 +0000 (23:28 +0000)]
am
75da543e: am
acd99d93: Merge "Add verity build targets for verity-enabled devices."
* commit '
75da543e8668bec28c4424e7573863fbcfd5c82e':
Glenn Kasten [Mon, 12 May 2014 23:28:50 +0000 (23:28 +0000)]
am
767d1b2d: am
f2a57a56: am
66b6b628: am
0c2acdc0: am
023c2865: am
97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
* commit '
767d1b2d792575622ea60b63151ee3f2fc300fde':
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':