Ying Wang
|
fd4b7136e6
|
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':
|
2014-05-12 23:29:53 +00:00 |
|
Ying Wang
|
e309f3c805
|
am 0ac1a74d: am 0fd79215: am 25c0096b: am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '0ac1a74d25d3aba1b576d511561067bffda20768':
|
2014-05-12 23:29:52 +00:00 |
|
Ying Wang
|
e4009272f5
|
am c11c8b31: am db70e23f: am be835b6f: am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."
* commit 'c11c8b3183c934dd0a0de2c6b897d2a8c3b25f23':
|
2014-05-12 23:29:51 +00:00 |
|
Scott Kennedy
|
3f0baae738
|
am 705782bf: am 98029d9d: am ee16b2c2: am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields
* commit '705782bf261a38444e3b542b0fdd8205192f59cc':
|
2014-05-12 23:29:50 +00:00 |
|
Ying Wang
|
97fb8b6701
|
am 2149e0bf: am b29d44e6: am 821b37d8: am 0df45b08: am 260942fa: Merge "Build with java7 by default."
* commit '2149e0bf21e66f9d271a80cc588516db94b5daf9':
|
2014-05-12 23:29:49 +00:00 |
|
Ying Wang
|
6193c52627
|
am 84d8544c: am 7d43b0f6: am f90ef06f: am 73c1422d: am b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '84d8544c9f048ddb0e0b6e3c23bbd74a1a0aeed9':
|
2014-05-12 23:29:48 +00:00 |
|
Doug Zongker
|
c2063dbf3f
|
am 85f679f9: am f12362a1: Merge "select recovery assets based on target density"
* commit '85f679f9a740ca8238b173d33f0fdf4f260a72c8':
|
2014-05-12 23:29:47 +00:00 |
|
Ying Wang
|
13d4a60e19
|
am ce150659: am 01e91869: Merge "Build with java7 by default."
* commit 'ce15065945cc2921124ff5dfb1a3fb0068f15fc1':
|
2014-05-12 23:29:47 +00:00 |
|
Steve Moyer
|
e1ba9cd0ac
|
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':
|
2014-05-12 23:29:46 +00:00 |
|
Geremy Condra
|
036e3b3242
|
am 548055a9: am 8cc491cf: Merge "Add verity dev keys to build."
* commit '548055a91ba2e6ace7d856bc5b83d0093fc98b62':
|
2014-05-12 23:29:45 +00:00 |
|
Ji-Hwan Lee
|
6139d4f445
|
am a03a50a2: am b2876247: Merge "Add handheld_core_hardware.xml to telephony base"
* commit 'a03a50a2bc942d6e5c399debd370ba03be29b182':
|
2014-05-12 23:29:44 +00:00 |
|
Ying Wang
|
4246078dbf
|
am b33f4ede: am 8700eb60: am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit 'b33f4ede0c7dad9066a73abae4bdf7bfac0becfd':
|
2014-05-12 23:29:43 +00:00 |
|
Dirk Dougherty
|
dd303f318e
|
am e7c3612d: am 31bfe838: am 5fe1b387: am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages.
* commit 'e7c3612db03a283e2b667f9a4b56afce42328f40':
|
2014-05-12 23:29:42 +00:00 |
|
Greg Hackmann
|
6739068c9b
|
am 40a198c6: am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '40a198c6f3ed230c7b89c8df5d58909705986129':
|
2014-05-12 23:29:41 +00:00 |
|
Colin Cross
|
267e811fb3
|
am 3a316e63: am 9871d2e2: am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '3a316e63f2998be2b44cdbb15acc65d8d80d813a':
|
2014-05-12 23:29:40 +00:00 |
|
Torne (Richard Coles)
|
8231478212
|
am cd6a2dd9: am dc74b380: am e4915bbe: am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit 'cd6a2dd91aa4ed31252e49c18c1bb149067f0b72':
|
2014-05-12 23:29:40 +00:00 |
|
Narayan Kamath
|
a6b59ad0f4
|
am 07baf958: am 775da50d: am bfc9b30d: (-s ours) am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."
* commit '07baf95875d4a72f154908aa84fe1ea05a487882':
|
2014-05-12 23:29:37 +00:00 |
|
Narayan Kamath
|
8d1b9b023f
|
am d1282ef5: am 797741ad: am 839d2829: (-s ours) am 35200762: am e28df19e: Merge "Call "java[c] -version" only once"
* commit 'd1282ef5557d2c226a2235ff194de71aedb54872':
|
2014-05-12 23:29:36 +00:00 |
|
Narayan Kamath
|
5df77238dc
|
am 0919322d: am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."
* commit '0919322dad6b7744c2698b21badc9596f9008153':
|
2014-05-12 23:29:35 +00:00 |
|
Nicolas Geoffray
|
05a5268a3a
|
am fb5c7e58: am 108df578: am 7e28c074: am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit 'fb5c7e58149f6ff585e9c24c21942410cd866814':
|
2014-05-12 23:29:34 +00:00 |
|
Dmitriy Ivanov
|
a7a3dc1f57
|
am 95c96c46: am cc733968: am 7e739e54: am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '95c96c463f70bb709e46d523c3cf41dc0847ed6b':
|
2014-05-12 23:29:32 +00:00 |
|
Tim Murray
|
38e42d9008
|
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':
|
2014-05-12 23:29:30 +00:00 |
|
Brian Carlstrom
|
480fe75c44
|
am 944f3eef: am 4d864206: am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp
* commit '944f3eef9b46c7c0a5f905e4273206c47223ba4a':
|
2014-05-12 23:29:28 +00:00 |
|
Brian Carlstrom
|
2beb261449
|
am bb305d19: am 3415c72d: am 31061ccf: am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div"
* commit 'bb305d190c91cde61d9860bd502a9bb1f87ef3ee':
|
2014-05-12 23:29:27 +00:00 |
|
Narayan Kamath
|
ee4bc5d6d1
|
am 13185b8c: am c54d7f21: am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '13185b8ce7d0775d682fbf47ef1db583c6186974':
|
2014-05-12 23:29:26 +00:00 |
|
Ying Wang
|
61dd3a3b9f
|
am fe6f0411: am 923f21d9: am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit 'fe6f041161c8529c576f40db81f350a39528ef44':
|
2014-05-12 23:29:25 +00:00 |
|
Ying Wang
|
56f8f2c5b3
|
am f596b187: am 710e0265: resolved conflicts for merge of f966bda4 to master
* commit 'f596b1872acad07ee66b165b73f8dddd693994d7':
|
2014-05-12 23:29:24 +00:00 |
|
Christopher Ferris
|
6f3f92bdcc
|
am c888dbbd: am 707354c0: am fc1a735e: am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit 'c888dbbdb4312ec785855ee23e48d95a02f282c3':
|
2014-05-12 23:29:23 +00:00 |
|
Ying Wang
|
3c986e03d0
|
am 18101975: am 82784b28: am 1758fe1f: am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '181019753cb126134c173a5f097e5f6c050e245f':
|
2014-05-12 23:29:22 +00:00 |
|
Narayan Kamath
|
aa5b152a63
|
am 7e600a32: am b4d757b1: am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '7e600a32551427173d4d0c070028f69957230bd2':
|
2014-05-12 23:29:20 +00:00 |
|
Mathieu Chartier
|
db85ab0eaa
|
am e56b9a8f: am 376c686d: am 7803fde3: am baa8a1b3: am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit 'e56b9a8f57a56149929ffba1e7d2e42ceabea6c2':
|
2014-05-12 23:29:19 +00:00 |
|
Scott Main
|
536ac93ef7
|
am 3e2bfef1: am a1cda0e3: am 4a942fbb: am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '3e2bfef14cfb00baa88a5b4b6e689bcbdf17d6fc':
|
2014-05-12 23:29:18 +00:00 |
|
Ying Wang
|
242c3ae8fa
|
am ca55d27e: am d2c1f122: am 9efc18fb: am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."
* commit 'ca55d27e3c28203ad994571c126bc07ee190113b':
|
2014-05-12 23:29:17 +00:00 |
|
Scott Main
|
cce2ee1762
|
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':
|
2014-05-12 23:29:16 +00:00 |
|
Scott Main
|
9279597e7f
|
am e54c6645: am 4f311964: am 9e81f2c2: am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit 'e54c6645314c2081cfb9916c3ef000427458e8fe':
|
2014-05-12 23:29:16 +00:00 |
|
Colin Cross
|
21faaa453f
|
am 5dde9123: am 6443630c: am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp
* commit '5dde91231bd05821080b5bad60f337ab9368ec22':
|
2014-05-12 23:29:15 +00:00 |
|
Xavier Ducrohet
|
0f6420ad3c
|
am 56760822: am 86c0cf68: am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '56760822cbea6d5702901ca670ae37f129677d4b':
|
2014-05-12 23:29:14 +00:00 |
|
Geremy Condra
|
3bf82a0608
|
am 89c78d35: am 9a6e8764: Merge "Add the verity key to the verity dependencies."
* commit '89c78d357a9a620a2197ef2e6eccc14fa7fb61a7':
|
2014-05-12 23:29:13 +00:00 |
|
Adam Lesinski
|
a12c5d8ddf
|
am cc8bb17e: am 9d9dbaba: Merge "Temporarily use a separate var for including shared resources"
* commit 'cc8bb17e208a87e54aac8aadc5a7f072269969b6':
|
2014-05-12 23:29:12 +00:00 |
|
Colin Cross
|
4caf62cc75
|
am bf7f18ee: am c93c10a7: am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'
* commit 'bf7f18ee3126f3afb0834bf178eb1d4a7fefc460':
|
2014-05-12 23:29:11 +00:00 |
|
Ying Wang
|
58069c4111
|
am 43759571: am dbe23f5d: Set up dependency of resource_export_package
* commit '43759571d7f7334eab5040b698035f3ae5474060':
|
2014-05-12 23:29:10 +00:00 |
|
Ricardo Cervera
|
63779ff06b
|
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':
|
2014-05-12 23:29:09 +00:00 |
|
Tim Murray
|
cbbdd6c336
|
am 46b5caa6: am 1bbba7d4: am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '46b5caa6ed6aab011549fb8951e9cc6c2f5990c2':
|
2014-05-12 23:29:09 +00:00 |
|
Colin Cross
|
1a9e4b5edd
|
am f2d98e3f: am 9b269f22: am 3c1183a6: am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit 'f2d98e3f1cbfac67ca9957e4f0a110734e0f19a3':
|
2014-05-12 23:29:08 +00:00 |
|
Ying Wang
|
7d441578d0
|
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':
|
2014-05-12 23:29:07 +00:00 |
|
Adam Lesinski
|
7e7f44ae98
|
am d7ac94c5: am de057c30: Add LOCAL_APK_LIBRARIES to the AAPT -I flag
* commit 'd7ac94c5da380e2b9482031860a51b9c6aff381d':
|
2014-05-12 23:29:06 +00:00 |
|
Tim Kilbourn
|
5f9c334b9c
|
am 83a839d9: am a5fdf90b: Merge "Add wifi-service to PRODUCT_PACKAGES."
* commit '83a839d9459fbb9ab8b76ffc134f9eae008aa323':
|
2014-05-12 23:29:05 +00:00 |
|
Andrew Hsieh
|
8e85a2ee47
|
am 36db5b16: am 1477080e: am cde91b3e: am 0adc6431: am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '36db5b1610a282b73884895360736f3442b35a5e':
|
2014-05-12 23:29:04 +00:00 |
|
Ying Wang
|
bdd4b9a890
|
am f50d134c: am 595f996f: am 7a93f683: am 82a2ae71: am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency"
* commit 'f50d134c354dd09051d8640e4cff983e4e938654':
|
2014-05-12 23:29:03 +00:00 |
|
Colin Cross
|
648eee38b4
|
am 5a7f5b28: am cf1f9d2d: fix bad merge conflict resolution
* commit '5a7f5b2848c43dc27d7d5af9ecc3c156e6af5b43':
|
2014-05-12 23:29:02 +00:00 |
|