git.osdn.net Git - android-x86/build.git/log

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Lajos Molnar [Mon, 12 May 2014 23:30:36 +0000 (23:30 +0000)]

am 5635946f: am 9fcc2da4: Merge "Remove VideoEditor"

* commit '5635946ff81005148799e8fd96557f5beb76daa3':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:30:27 +0000 (23:30 +0000)]

am 18a53d29: am 0d8179e8: fix tapas to work in more shells

* commit '18a53d297ee8bfcfd575e18f55401503ff8b50b7':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Evgeniy Stepanov [Mon, 12 May 2014 23:30:25 +0000 (23:30 +0000)]

am 7b1bcd8a: am 5d8029f2: Update ASan configuration.

* commit '7b1bcd8a1d0fc8c770fb8cad5cf6a4ff258b39ae':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]

am 24f62a54: am d37bf4e9: am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"

* commit '24f62a54e16a2310d25796c9a3a7cfb5114e5c90':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]

am 5aa6416b: am c73e4615: Fix variable name.

* commit '5aa6416b600ecdd492892a18839bbb5f6da7b7f8':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:30:21 +0000 (23:30 +0000)]

am b29c3e64: am a1f8afa9: am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."

* commit 'b29c3e64d25254c7dfd67586ff4d5881ba5fa492':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:30:08 +0000 (23:30 +0000)]

am 8584b212: am 87cf2b5b: am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"

* commit '8584b2124a400de96f8492e9c324921047753c33':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Jon Boekenoogen [Mon, 12 May 2014 23:29:56 +0000 (23:29 +0000)]

am dd15b50f: am 13a34244: am 0f2e5657: am 9ccadc82: am a8245d1d: Merge "ggrep" into klp-ub-dev

* commit 'dd15b50f410c734c4946624e1189a7d0eb6afeae':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:29:51 +0000 (23:29 +0000)]

am c11c8b31: am db70e23f: am be835b6f: am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."

* commit 'c11c8b3183c934dd0a0de2c6b897d2a8c3b25f23':

commit | commitdiff | tree

Scott Kennedy [Mon, 12 May 2014 23:29:50 +0000 (23:29 +0000)]

am 705782bf: am 98029d9d: am ee16b2c2: am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields

* commit '705782bf261a38444e3b542b0fdd8205192f59cc':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:29:49 +0000 (23:29 +0000)]

am 2149e0bf: am b29d44e6: am 821b37d8: am 0df45b08: am 260942fa: Merge "Build with java7 by default."

* commit '2149e0bf21e66f9d271a80cc588516db94b5daf9':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:29:27 +0000 (23:29 +0000)]

am bb305d19: am 3415c72d: am 31061ccf: am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div"

* commit 'bb305d190c91cde61d9860bd502a9bb1f87ef3ee':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:29:25 +0000 (23:29 +0000)]

am fe6f0411: am 923f21d9: am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"

* commit 'fe6f041161c8529c576f40db81f350a39528ef44':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:29:11 +0000 (23:29 +0000)]

am bf7f18ee: am c93c10a7: am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'

* commit 'bf7f18ee3126f3afb0834bf178eb1d4a7fefc460':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:29:02 +0000 (23:29 +0000)]

am 5a7f5b28: am cf1f9d2d: fix bad merge conflict resolution

* commit '5a7f5b2848c43dc27d7d5af9ecc3c156e6af5b43':

commit | commitdiff | tree

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':