OSDN Git Service
Marco Nelissen [Mon, 12 May 2014 23:31:02 +0000 (23:31 +0000)]
Colin Cross [Mon, 12 May 2014 23:31:01 +0000 (23:31 +0000)]
am
a9d20290: am
39fef1f4: am
6f916664: am
735628e8: am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
a9d20290f22b334560f078373b59e9dff9d9866b':
Michael Runge [Mon, 12 May 2014 23:31:00 +0000 (23:31 +0000)]
am
1a29ea8a: am
0a2ce08f: Merge "Support block OTA + OEM partition"
* commit '
1a29ea8ae81244eb75668536089cbd34db0f949c':
David 'Digit' Turner [Mon, 12 May 2014 23:30:59 +0000 (23:30 +0000)]
am
88c6a966: am
1ce02c98: Merge "envsetup.sh: Use prebuilt emulator binaries if available."
* commit '
88c6a9660082f2e29ddf2364b69b02fd2b4fba3c':
Ying Wang [Mon, 12 May 2014 23:30:58 +0000 (23:30 +0000)]
am
33d5328c: am
15f6287e: am
0049c40e: am
54a570bd: am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
33d5328c554a825fb107829fc501d90b461f9ac3':
Justin Koh [Mon, 12 May 2014 23:30:57 +0000 (23:30 +0000)]
Colin Cross [Mon, 12 May 2014 23:30:56 +0000 (23:30 +0000)]
am
38b06024: am
e8eef02c: Merge "verity: switch to C++ version of build_verity_tree"
* commit '
38b06024cd371bea5dc4132c0f090f6e05e07e2f':
Dirk Dougherty [Mon, 12 May 2014 23:30:56 +0000 (23:30 +0000)]
am
28efc077: am
03257fe5: am
d19aa4ba: am
611d7e14: am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
28efc077f22eeea90c522449a53634b5a65b727e':
Chad Jones [Mon, 12 May 2014 23:30:55 +0000 (23:30 +0000)]
am
3e5fee45: am
07292323: Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
* commit '
3e5fee453c63a2bbae9ad9403d43bca713e0b10a':
Tim Murray [Mon, 12 May 2014 23:30:54 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:53 +0000 (23:30 +0000)]
am
9067ec11: am
40567982: am
372df5a4: am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
9067ec11cd9d82508c436e2723fb38f6fadbd773':
Michael Runge [Mon, 12 May 2014 23:30:52 +0000 (23:30 +0000)]
am
8544bc76: am
6e836116: Add support for verifying OEM properties.
* commit '
8544bc76053806bd25957d23309a0a855f03c1c1':
Torne (Richard Coles) [Mon, 12 May 2014 23:30:52 +0000 (23:30 +0000)]
am
4d66a7f7: am
a1215ab9: am
2b2a4953: am
f0b5bfec: am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
4d66a7f76acec2b5b1a44623fecbca0e2cc74801':
Tim Murray [Mon, 12 May 2014 23:30:51 +0000 (23:30 +0000)]
am
e7dd89c8: am
93dc0578: am
cf53e0e0: am
27fe9406: am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
e7dd89c833f07b3edfecf98852a535437a84aaf3':
Colin Cross [Mon, 12 May 2014 23:30:50 +0000 (23:30 +0000)]
am
f4a02040: am
e5381d07: Merge "verity: clean up verity build dependencies"
* commit '
f4a020405a59ccb49633440065e68c1b3356073a':
Narayan Kamath [Mon, 12 May 2014 23:30:49 +0000 (23:30 +0000)]
am
7c5b5347: am
666bc685: am
7d26e97e: am
3f1d1608: am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
7c5b5347849f709c12e112a312d6107c2d801d05':
Bill Yi [Mon, 12 May 2014 23:30:48 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:47 +0000 (23:30 +0000)]
am
e333b45b: am
09a4e687: Add SDK product for arm64, x86_64 and mips64.
* commit '
e333b45b47c0b190c7b0daf45c98b49e03d6546d':
Andrew Hsieh [Mon, 12 May 2014 23:30:47 +0000 (23:30 +0000)]
am
1a023497: am
293ccf9a: am
d815dbd1: am
f14ba5b9: am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
1a023497022f9f51b7e9d1e56d74618fe8e0f07e':
Jason Parks [Mon, 12 May 2014 23:30:46 +0000 (23:30 +0000)]
am
07279937: am
13b2e19e: Use java_home to determine jdk location.
* commit '
072799378b665a6668348e2472c6c61a53e6916b':
Jeff Sharkey [Mon, 12 May 2014 23:30:45 +0000 (23:30 +0000)]
am
e4b8ba35: am
5ffee768: Merge "Set up rules to build oem.img"
* commit '
e4b8ba351d3a077d6ed9c0f21fd6ad6b02198d21':
Torne (Richard Coles) [Mon, 12 May 2014 23:30:44 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:43 +0000 (23:30 +0000)]
am
19eca03f: am
66750e63: am
d4cc9dad: am
1427f872: am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
19eca03f2af2813923d855408cf0179ad07a7056':
Stephen Hines [Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)]
am
a494ae9b: am
46df1818: am
f0dda8d0: am
9661b09f: am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
a494ae9bafcd36329804b090909c23b2377fd4e1':
Ying Wang [Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)]
am
beefce58: am
8d4562a1: resolved conflicts for merge of
0a694f4c to master
* commit '
beefce58dc9e1987143391634c09249d478bd598':
Dianne Hackborn [Mon, 12 May 2014 23:30:41 +0000 (23:30 +0000)]
am
9fe33ae8: am
6ee3c432: Add new facility to have multiple active codenames.
* commit '
9fe33ae85783f8e79ffb624486efc3c6a69a3868':
Elliott Hughes [Mon, 12 May 2014 23:30:40 +0000 (23:30 +0000)]
am
6ee42ec1: am
52db54cc: am
bb21bfb0: am
7cad688e: am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
6ee42ec18cd65b7332b380a8f153d614751f15b5':
Elliott Hughes [Mon, 12 May 2014 23:30:39 +0000 (23:30 +0000)]
am
d907d41b: am
1d753dda: am
439f279d: am
62911d47: am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
d907d41b5a9dfb47a1f6d3d28cc6e3ce748f5d9b':
Torne (Richard Coles) [Mon, 12 May 2014 23:30:38 +0000 (23:30 +0000)]
am
238c44ca: am
131e93af: am
04a6aa26: am
081c1c59: am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
238c44cac5c04449a3bb0b9be9720b721acd809b':
Andrew Hsieh [Mon, 12 May 2014 23:30:37 +0000 (23:30 +0000)]
am
a06aa411: am
582e5ecb: am
aabe27cc: am
9754735f: am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
a06aa411f6db97ff4f2198721dc9f06df566e1d1':
Ying Wang [Mon, 12 May 2014 23:30:37 +0000 (23:30 +0000)]
am
e99cb20d: am
6e048afb: am
ad60c86e: am
f1a3d5e8: am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
e99cb20d68382ae53fecc819ff5fcb2c1e348161':
Lajos Molnar [Mon, 12 May 2014 23:30:36 +0000 (23:30 +0000)]
Ian Rogers [Mon, 12 May 2014 23:30:35 +0000 (23:30 +0000)]
am
78d9bec5: am
2b96d6ae: resolved conflicts for merge of
77efd7b4 to master
* commit '
78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01':
Ying Wang [Mon, 12 May 2014 23:30:34 +0000 (23:30 +0000)]
am
ada19782: am
2290cbf8: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
ada19782721bdb100555ffadc4f5c8b6500daab5':
Ying Wang [Mon, 12 May 2014 23:30:33 +0000 (23:30 +0000)]
am
dc6801bd: am
141ed582: am
fff7583f: am
a59c2935: am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
dc6801bd18ecb8fa0660a03c88c46dc9f3871172':
Ian Rogers [Mon, 12 May 2014 23:30:32 +0000 (23:30 +0000)]
am
b6b9add0: am
621cefb8: am
29eb3d09: am
9b3fb2c3: am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
b6b9add0619e95f9c50963d7d1e8b7c1a946ea7b':
Ben Cheng [Mon, 12 May 2014 23:30:31 +0000 (23:30 +0000)]
am
9e5d7acf: am
1d9c67dd: am
1bb663a8: am
26232093: am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
9e5d7acff86382f64ce653f242cdb1ead14a7e76':
Ying Wang [Mon, 12 May 2014 23:30:31 +0000 (23:30 +0000)]
am
94fbbfad: am
c1676c92: Merge "Update rules to install JNI libraries."
* commit '
94fbbfadc95a97ddc38196594fe89cc565051f17':
Ben Cheng [Mon, 12 May 2014 23:30:30 +0000 (23:30 +0000)]
am
52db031f: am
5de2b7ff: am
ea9552eb: am
dc82c5a8: am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
52db031fa255fd25c523dce0fa13285b13845d88':
Ying Wang [Mon, 12 May 2014 23:30:29 +0000 (23:30 +0000)]
am
bd1b622c: am
a376dd8b: Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
* commit '
bd1b622cf9fd2374fe4454ad0d785024a3dfa2ac':
Ying Wang [Mon, 12 May 2014 23:30:28 +0000 (23:30 +0000)]
am
23571fd7: am
7cd663f0: Merge "Fix html_dir_files in droiddoc.mk"
* commit '
23571fd7560355758a3db289b3bfd2b632988439':
Doug Zongker [Mon, 12 May 2014 23:30:27 +0000 (23:30 +0000)]
Ben Cheng [Mon, 12 May 2014 23:30:26 +0000 (23:30 +0000)]
am
8bcbc43e: am
45518095: am
455e499b: am
6350c21e: am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
8bcbc43e50e447e167a2f2ce0fe4416ffe5baa94':
Evgeniy Stepanov [Mon, 12 May 2014 23:30:25 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:24 +0000 (23:30 +0000)]
am
7e44b38b: am
105ed03c: am
25e75aba: am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
7e44b38b119e65391e2e5825780c31f7e1efc8cf':
Andrew Hsieh [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]
Ying Wang [Mon, 12 May 2014 23:30:22 +0000 (23:30 +0000)]
am
23bf7212: am
51f0d3f5: resolved conflicts for merge of
70555a16 to master
* commit '
23bf7212ce4ee925569eba7a0c9e4197981f9a29':
Narayan Kamath [Mon, 12 May 2014 23:30:21 +0000 (23:30 +0000)]
Scott Main [Mon, 12 May 2014 23:30:20 +0000 (23:30 +0000)]
am
30426855: am
e65e2134: am
554bb7b6: am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
304268550504fa3bccb860b9430d7b4ea30b1d1e':
Ying Wang [Mon, 12 May 2014 23:30:12 +0000 (23:30 +0000)]
am
0cbe2702: am
114b46f1: Accomodate to the import syntax in build.prop.
* commit '
0cbe27026d0735b9b2639f23f821d4f43cce6fe9':
Ying Wang [Mon, 12 May 2014 23:30:11 +0000 (23:30 +0000)]
am
74afb718: am
5a7ad033: Accomodate to the import syntax in build.prop.
* commit '
74afb71873e22d5489d92c3e86c71228f961d70f':
Ying Wang [Mon, 12 May 2014 23:30:10 +0000 (23:30 +0000)]
am
64c092c6: am
f0534c28: LOCAL_CERTIFICATE only applies to APPS.
* commit '
64c092c678d5e2e2a50894b6c15e2cdfc74545b9':
Scott Main [Mon, 12 May 2014 23:30:09 +0000 (23:30 +0000)]
am
0d117b3b: am
74e22573: am
78f264f7: am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
0d117b3bd237f65d03fdfdb83d3b1da70ef4a1bc':
Dirk Dougherty [Mon, 12 May 2014 23:30:08 +0000 (23:30 +0000)]
am
5c9e8e26: am
7b1fe64c: am
7de9c942: am
45094b5d: am
d0c6f0a1: am
318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '
5c9e8e2673af31e1c36ae7d92ab6de00a039c8f2':
Colin Cross [Mon, 12 May 2014 23:30:08 +0000 (23:30 +0000)]
Ben Cheng [Mon, 12 May 2014 23:30:07 +0000 (23:30 +0000)]
am
c8801755: am
bdcb4bcd: am
e921da9d: am
bddce34c: am
065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit '
c8801755dbf95fc17c57c6cc2477685c9afba567':
Ben Cheng [Mon, 12 May 2014 23:30:06 +0000 (23:30 +0000)]
am
6deaf208: am
2b240a7b: am
c9f9decd: am
4eea070c: am
f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit '
6deaf208e5e6e809b5dd09af800e77a2ee17b655':
Ben Cheng [Mon, 12 May 2014 23:30:05 +0000 (23:30 +0000)]
am
6ac86235: am
19b7c4d5: am
e4d787bf: am
7e793040: am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
6ac86235ca47ae510cf527fbe8804d78d83cab06':
Colin Cross [Mon, 12 May 2014 23:30:04 +0000 (23:30 +0000)]
am
f79b0ad8: am
6c277fac: am
14203772: am
3221717f: am
a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* commit '
f79b0ad84bbd9646ee3462924c0884ea31686d17':
Scott Main [Mon, 12 May 2014 23:30:03 +0000 (23:30 +0000)]
am
db7b5d17: am
e737ca9a: am
7bb8315c: am
4786cc3b: am
de22e6fb: am
20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
* commit '
db7b5d171147ef0a79b9903caddd16641d3452fa':
Colin Cross [Mon, 12 May 2014 23:30:02 +0000 (23:30 +0000)]
am
f2e35a0b: am
bde0c5a4: am
fa75d63c: am
dbf1f804: am
80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit '
f2e35a0b03f9803da0925865f7b8984f693dfc85':
Ben Cheng [Mon, 12 May 2014 23:30:02 +0000 (23:30 +0000)]
am
172b29b9: am
335c76d8: am
c77ffa89: am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
172b29b94defce47e8794378894c1710728a71ce':
Ben Cheng [Mon, 12 May 2014 23:30:01 +0000 (23:30 +0000)]
am
5f321a48: am
c760ecbd: am
9cbf732f: am
98bb9d6c: am
d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '
5f321a4842cee6de0cd96a428b485c1cc1fdf297':
Jeff Sharkey [Mon, 12 May 2014 23:30:00 +0000 (23:30 +0000)]
am
a8e3044d: am
26e1a28e: Pass OEM property list to OTA tools, thumbprint.
* commit '
a8e3044decafaca3323f64b48d9b2d25c9d2b43c':
Ying Wang [Mon, 12 May 2014 23:29:59 +0000 (23:29 +0000)]
am
d8553abb: am
9ef2bee2: am
09ba20ce: am
fd251b33: am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
d8553abbbfe0a38740bdcce87a75903bb9d5492b':
Narayan Kamath [Mon, 12 May 2014 23:29:58 +0000 (23:29 +0000)]
am
81df2d13: am
ed1c1193: am
6c0fba0f: am
ae44bb55: am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
81df2d13d98f4b01ce6bca79b8248830536dc37e':
Jeff Sharkey [Mon, 12 May 2014 23:29:57 +0000 (23:29 +0000)]
am
5d7f3c6d: am
491055df: Merge "Import OEM build properties, if defined."
* commit '
5d7f3c6d60ae316ab8a7767dc51d22bc231e5b47':
Jon Boekenoogen [Mon, 12 May 2014 23:29:56 +0000 (23:29 +0000)]
Narayan Kamath [Mon, 12 May 2014 23:29:55 +0000 (23:29 +0000)]
am
b35b8bed: am
110ea46e: resolved conflicts for merge of
8af7e8ed to master
* commit '
b35b8bed841f234b6862bf445973fd1534892163':
Alan Viverette [Mon, 12 May 2014 23:29:54 +0000 (23:29 +0000)]
am
c619de35: am
38568b42: Preserve symlinked OUT_DIR by only clearing contents
* commit '
c619de3592c6c80422ce2c7b5338bff90b790161':
Dirk Dougherty [Mon, 12 May 2014 23:29:53 +0000 (23:29 +0000)]
am
79c56a1c: am
eed8e1a2: am
049808e3: am
d031b4de: am
98cc173c: am
46b443ac: Adjust opacity for non-hover states and a few others.
* commit '
79c56a1cacfb504a3f9bbfec0734baa1502d9820':
Ying Wang [Mon, 12 May 2014 23:29:53 +0000 (23:29 +0000)]
am
75454ddd: am
ad7fdf3b: am
c9c3ed22: am
5d33de08: am
bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
* commit '
75454ddd2e77ebe019f1f8d88e95e53a7f0933be':
Ying Wang [Mon, 12 May 2014 23:29:52 +0000 (23:29 +0000)]
am
0ac1a74d: am
0fd79215: am
25c0096b: am
b55bb77e: am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
0ac1a74d25d3aba1b576d511561067bffda20768':
Ying Wang [Mon, 12 May 2014 23:29:51 +0000 (23:29 +0000)]
Scott Kennedy [Mon, 12 May 2014 23:29:50 +0000 (23:29 +0000)]
Ying Wang [Mon, 12 May 2014 23:29:49 +0000 (23:29 +0000)]
Ying Wang [Mon, 12 May 2014 23:29:48 +0000 (23:29 +0000)]
am
84d8544c: am
7d43b0f6: am
f90ef06f: am
73c1422d: am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
84d8544c9f048ddb0e0b6e3c23bbd74a1a0aeed9':
Doug Zongker [Mon, 12 May 2014 23:29:47 +0000 (23:29 +0000)]
am
85f679f9: am
f12362a1: Merge "select recovery assets based on target density"
* commit '
85f679f9a740ca8238b173d33f0fdf4f260a72c8':
Ying Wang [Mon, 12 May 2014 23:29:47 +0000 (23:29 +0000)]
am
ce150659: am
01e91869: Merge "Build with java7 by default."
* commit '
ce15065945cc2921124ff5dfb1a3fb0068f15fc1':
Steve Moyer [Mon, 12 May 2014 23:29:46 +0000 (23:29 +0000)]
am
d1996616: (-s ours) am
79980b47: am
2482da64: (-s ours) am
90b089de: (-s ours) am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
d19966162c90bd0474bb63a7514f5ce0b8ef73a1':
Geremy Condra [Mon, 12 May 2014 23:29:45 +0000 (23:29 +0000)]
am
548055a9: am
8cc491cf: Merge "Add verity dev keys to build."
* commit '
548055a91ba2e6ace7d856bc5b83d0093fc98b62':
Ji-Hwan Lee [Mon, 12 May 2014 23:29:44 +0000 (23:29 +0000)]
am
a03a50a2: am
b2876247: Merge "Add handheld_core_hardware.xml to telephony base"
* commit '
a03a50a2bc942d6e5c399debd370ba03be29b182':
Ying Wang [Mon, 12 May 2014 23:29:43 +0000 (23:29 +0000)]
am
b33f4ede: am
8700eb60: am
88e1a110: am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
b33f4ede0c7dad9066a73abae4bdf7bfac0becfd':
Dirk Dougherty [Mon, 12 May 2014 23:29:42 +0000 (23:29 +0000)]
am
e7c3612d: am
31bfe838: am
5fe1b387: am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
e7c3612db03a283e2b667f9a4b56afce42328f40':
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':