Dan Albert
|
a49e6472bf
|
am 7911f1b1: (-s ours) am 5e9f4912: am 578acca4: Merge "Link librt on the host when using sanitizers."
* commit '7911f1b1aa2e9301600645979b3dc118257ed50d':
|
2015-08-27 05:01:09 +00:00 |
|
Joe Fernandez
|
5fd19e12e9
|
am 28a044b7: (-s ours) am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '28a044b7e10adf184fa5197b5f5061cfe68a3250':
|
2015-08-27 05:01:07 +00:00 |
|
Tao Bao
|
1ccaeb7fa0
|
am 6968a724: (-s ours) am 3a2e91ca: am 8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '6968a724a5a169880fec2a96d4e32fd60bcaf7fb':
|
2015-08-27 05:01:05 +00:00 |
|
Chris Banes
|
cc32f243f8
|
am 0fd694f3: (-s ours) am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '0fd694f360fe67db1a6553796f478002a593da45':
|
2015-08-27 05:01:03 +00:00 |
|
Dan Albert
|
5b3c6beffa
|
am dc0e7244: (-s ours) am 2c00d629: am 727b462a: Merge "Never allow -w."
* commit 'dc0e7244a69230244d376bdb0c5385f1943d22a9':
|
2015-08-27 05:01:01 +00:00 |
|
Mike Dodd
|
f4db4dea5d
|
am 44af8f96: (-s ours) am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '44af8f9655f3c3c70bc9dfb804ef49d5a1286100':
|
2015-08-27 05:00:59 +00:00 |
|
Neil Fuller
|
dfae552e74
|
am 53d16326: (-s ours) am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '53d16326811afe2facdce416decc5e00edb4cd09':
|
2015-08-27 05:00:58 +00:00 |
|
Dianne Hackborn
|
b4f69d8264
|
am 42ebdfc5: (-s ours) am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '42ebdfc574cc2a07ce5fabcc785fb24a6e4211d0':
|
2015-08-27 05:00:56 +00:00 |
|
Nick Kralevich
|
f55f593de9
|
am 420662b9: (-s ours) am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '420662b9cdacf715de341db01e873b1ddc53f987':
|
2015-08-27 05:00:54 +00:00 |
|
Ian Pedowitz
|
96f3445478
|
am 3584355b: (-s ours) am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '3584355bb9eae99a8de209956317798669394aa5':
|
2015-08-27 05:00:52 +00:00 |
|
Mike Dodd
|
00686a1e80
|
am 5e1a9919: (-s ours) am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '5e1a991973531cca462d7184ad87ad3007a6056d':
|
2015-08-27 05:00:50 +00:00 |
|
Mike Dodd
|
d51540a285
|
am 5d5a3e0d: (-s ours) am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '5d5a3e0d9046a69b8e488bc753b5684615c67703':
|
2015-08-27 05:00:49 +00:00 |
|
Tao Bao
|
6f01e88263
|
am a2191764: (-s ours) am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
* commit 'a2191764f3536dbbe1596553bb34b929ba19dc0b':
|
2015-08-27 05:00:47 +00:00 |
|
Gina Dimino
|
6b3ae6ec75
|
am 505186cb: (-s ours) am 291232ae: am 8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace."
* commit '505186cb7a90866dacbeb714787f5dd529a4f1a0':
|
2015-08-27 05:00:45 +00:00 |
|
Dan Willemsen
|
e0ffa9f507
|
am 8478f7ab: (-s ours) resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp
* commit '8478f7abbd93982cb2bb3536a5e5af19b3c6755b':
|
2015-08-27 05:00:43 +00:00 |
|
Dan Willemsen
|
7be6dbf0c0
|
am 33f46daa: (-s ours) resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp
* commit '33f46daa22597ac5c50601d28036c563b6e23fa5':
|
2015-08-27 05:00:40 +00:00 |
|
Ying Wang
|
dce6cd7810
|
am 2bf0ba2d: (-s ours) am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '2bf0ba2dcf0c9f8417807e9688c652ff33e495dc':
|
2015-08-27 05:00:38 +00:00 |
|
Ian Pedowitz
|
e86811c564
|
am c3bc0b11: (-s ours) resolved conflicts for merge of e5a63158 to mnc-dev-plus-aosp
* commit 'c3bc0b112c86daab040c8839f9e4399d8e4f2c1a':
|
2015-08-27 05:00:37 +00:00 |
|
Clay Murphy
|
f12441f830
|
am f8cb77df: (-s ours) am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit 'f8cb77dfd2a6a0f0901bb63b02f901d216e72891':
|
2015-08-27 05:00:35 +00:00 |
|
Ian Pedowitz
|
762f553a12
|
am c08c3507: (-s ours) am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit 'c08c3507be8628eb455690a669d41a81af1e40db':
|
2015-08-27 05:00:33 +00:00 |
|
Ian Pedowitz
|
55e7168816
|
am d18917b7: (-s ours) am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
* commit 'd18917b7813c72c6ce41b266744fd89a1e331682':
|
2015-08-27 05:00:31 +00:00 |
|
Ian Pedowitz
|
d6c0e71906
|
am a1c92301: (-s ours) am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit 'a1c92301f4edc03e1e701a9774868111a3a722dc':
|
2015-08-27 05:00:29 +00:00 |
|
Ying Wang
|
f4a9b4be45
|
am 49e20876: (-s ours) am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit '49e20876b62ffe58b325e297f187e3d5b16a07f9':
|
2015-08-27 05:00:28 +00:00 |
|
Dan Albert
|
49f82302b0
|
am 92d6efc5: (-s ours) am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '92d6efc595b0e9da307eadaa182ba74712c844e4':
|
2015-08-27 05:00:26 +00:00 |
|
Tao Bao
|
fb1b3cf188
|
am e3f3a3a9: (-s ours) am 0fed6730: am 8af98164: Merge "Change the cache partition size check into warnings."
* commit 'e3f3a3a941edb854fd3f4f3df1a36aad37378933':
|
2015-08-27 05:00:24 +00:00 |
|
Tao Bao
|
e019633e07
|
am 44ca42a5: (-s ours) am 44c8e4db: am 420f95ff: Merge "releasetools: Support packaging for system_root_image."
* commit '44ca42a5159a5c2a9bb233d8ac0876e30529d8ab':
|
2015-08-27 05:00:22 +00:00 |
|
Dan Willemsen
|
999a025443
|
am 544fabce: (-s ours) am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
* commit '544fabcef08bbf0dc3345967cb7f29af9c8205a6':
|
2015-08-27 05:00:20 +00:00 |
|
Yusuf Ozuysal
|
86e4fe3f72
|
am d513d14c: (-s ours) am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
* commit 'd513d14c8f5aa729ce76fc4cc38e552af46f327b':
|
2015-08-27 05:00:18 +00:00 |
|
Gilad Arnold
|
6dd7e183dc
|
am 09905505: (-s ours) am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."
* commit '09905505f771e119b386d2331fd72cd23a37b506':
|
2015-08-27 05:00:16 +00:00 |
|
Dan Albert
|
b1765eb4f8
|
am a1df0e67: (-s ours) am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries."
* commit 'a1df0e6717a436f74ef9915e24db30470e22467f':
|
2015-08-27 05:00:14 +00:00 |
|
Dan Albert
|
f590c39ec2
|
am 6d5c952a: (-s ours) am 849bf820: am 735cd90d: Merge "Disable transitive symbol resolving for mips64."
* commit '6d5c952a7ee46e91a91c7a680e7187f547c3636d':
|
2015-08-27 05:00:12 +00:00 |
|
Tao Bao
|
25f88999c0
|
am 91fdd1a3: (-s ours) resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp
* commit '91fdd1a3219ba514a127d553878b582bc13e903f':
|
2015-08-27 05:00:10 +00:00 |
|
Ying Wang
|
017b712acb
|
am 4a368585: (-s ours) am a101f558: am ecbc5b40: Merge "Build static ckati on Linux."
* commit '4a368585a5f8ae44146c222f6e4b6050e583939e':
|
2015-08-27 05:00:07 +00:00 |
|
Christopher Wiley
|
74588b0e65
|
am a3dbe51f: (-s ours) resolved conflicts for merge of 7d1be400 to mnc-dev-plus-aosp
* commit 'a3dbe51f428f9202a00935cdb708987f3058da60':
|
2015-08-27 05:00:05 +00:00 |
|
Paul Miller
|
4713f533fe
|
am 15a45a6e: (-s ours) am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
* commit '15a45a6ea7060ee28d49d43e1fbd36782b370e13':
|
2015-08-27 05:00:03 +00:00 |
|
Ying Wang
|
c48455ab2d
|
am 6eed5fc7: (-s ours) am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master
* commit '6eed5fc703dbc89dff8715e16c21f402d139189d':
|
2015-08-27 05:00:00 +00:00 |
|
Ying Wang
|
2ac8afe4a0
|
am 7d985ffb: (-s ours) am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
* commit '7d985ffb1e9e078d021e5ed1d62653f4d412fe7f':
|
2015-08-27 04:59:57 +00:00 |
|
Ying Wang
|
48157c250a
|
am 27fa4a30: (-s ours) am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
* commit '27fa4a30ec68215f3ffd9f2a5ae9d048e9f594d8':
|
2015-08-27 04:59:51 +00:00 |
|
Ying Wang
|
43598768cd
|
am c7b8ee09: (-s ours) am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit 'c7b8ee09748d7e47182c6cf90d96810d9c14fd21':
|
2015-08-27 04:59:45 +00:00 |
|
Ying Wang
|
79a2665c28
|
am 0a1026ce: (-s ours) am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit '0a1026ce27e1c42054d6362d3401bf4054987678':
|
2015-08-27 04:59:42 +00:00 |
|
Daniel Rosenberg
|
4e39b0904f
|
am 1e6ee759: (-s ours) am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit '1e6ee759b35ce79483d8fc4a5bb24553654a39d0':
|
2015-08-27 04:59:37 +00:00 |
|
Daniel Rosenberg
|
60e7f3e6ad
|
am 93d8ea20: (-s ours) am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"
* commit '93d8ea20b853e02ad995874f644346a6a6270db9':
|
2015-08-27 04:59:34 +00:00 |
|
Daniel Rosenberg
|
f5da6cfe60
|
am b7c57cba: (-s ours) am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit 'b7c57cba9f50e7504b0bae1fab62fc0cc06ad325':
|
2015-08-27 04:59:30 +00:00 |
|
Dan Albert
|
094629ac96
|
am 8405451f: (-s ours) am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH."
* commit '8405451f90bd0076018199191e2387c1d5ca76e8':
|
2015-08-27 04:59:24 +00:00 |
|
Gina Dimino
|
5cd8259a3d
|
am 12c64538: (-s ours) am a5bacf6e: am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
* commit '12c64538acbc1a704e267983538b8a00534b8801':
|
2015-08-27 04:59:19 +00:00 |
|
Dianne Hackborn
|
5b0f312710
|
am 59382b54: (-s ours) am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '59382b54b6e0ce9227aed866ad7df75b258c30bb':
|
2015-08-27 04:59:16 +00:00 |
|
Tao Bao
|
e6a41e168f
|
Merge branch 'mnc-dr-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/build into mnc-dr-dev-plus-aosp
|
2015-08-27 04:59:14 +00:00 |
|
Tao Bao
|
701a318033
|
am c5bd8c29: (-s ours) resolved conflicts for merge of bbb41a70 to mnc-dev-plus-aosp
* commit 'c5bd8c29d6b65ae8f602b63298c0831044e0dc03':
|
2015-08-27 04:59:12 +00:00 |
|
Tony Mantler
|
871e2293d6
|
am 8e25a77e: (-s ours) am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit '8e25a77e083895a08cf8227f3c66bd52f96608b8':
|
2015-08-27 04:59:03 +00:00 |
|
Dan Albert
|
a53ea82996
|
am 8ee4d273: (-s ours) am 35a8ae7b: am 8427c587: Merge "Make TSAN easier to use."
* commit '8ee4d2738c588fa286f7b37398c265a57236f002':
|
2015-08-27 04:58:59 +00:00 |
|