Elliott Hughes
|
863e9cdb86
|
am 94ee3eab: am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '94ee3eab007e30169c7bd999253f091d0fb3fc1e':
|
2015-08-27 14:26:21 +00:00 |
|
Elliott Hughes
|
a65ec5288c
|
am c826b5b0: am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit 'c826b5b0643df03ae3607fcb0954869bf09466a7':
|
2015-08-27 14:26:08 +00:00 |
|
Jeff Sharkey
|
9637984b04
|
am 1d87302d: am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.
* commit '1d87302df6c4a13b8a35e50ebdada19e5b8ba521':
|
2015-08-27 14:25:48 +00:00 |
|
Elliott Hughes
|
a49732b757
|
am e455dff0: am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit 'e455dff013360eb266ac6ecc0a63a5871722f27a':
|
2015-08-27 14:25:27 +00:00 |
|
Elliott Hughes
|
bfa03aff9d
|
am faa14c2e: am e45a6650: (-s ours) am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'faa14c2eec070aeb4d7839793b47231b9afeeac1':
|
2015-08-27 14:25:08 +00:00 |
|
Nick Kralevich
|
63af7a6bba
|
am d09d1ff3: am 64be1683: (-s ours) am d9bb7852: am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit 'd09d1ff37c60aab5e5ff46b23f3fd93777b9da72':
|
2015-08-27 14:24:55 +00:00 |
|
Sami Tolvanen
|
ed58676f26
|
am 0405485c: am 5f2b3b4b: (-s ours) am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '0405485c79037eef64efb4ab2d86c2ce71ff88e5':
|
2015-08-27 14:24:37 +00:00 |
|
Daniel Rosenberg
|
447b80609b
|
am 861dfa79: am be92912d: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit '861dfa7917a79f8bffbb35a51f52a43b59b836bf':
|
2015-08-27 14:24:28 +00:00 |
|
Daniel Rosenberg
|
2bfbd82a94
|
am b94b4f1a: am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit 'b94b4f1ad502824f9da8e002055e32992d0f3fa4':
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
|
2015-08-27 14:24:12 +00:00 |
|
Daniel Rosenberg
|
8c2e86ef1d
|
am b4bb346e: am 6b6687be: (-s ours) am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc"
* commit 'b4bb346e4cddddc80ec654571776f699742065c8':
|
2015-08-27 14:24:05 +00:00 |
|
Daniel Rosenberg
|
8fa4db3d87
|
am b4943598: am cdf768fe: (-s ours) am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"
* commit 'b4943598bc91100fe4eef76e658adb6ce1e87f04':
|
2015-08-27 14:23:59 +00:00 |
|
Yin-Chia Yeh
|
ae0925cc12
|
am b4b83c1c: am 84cf943a: (-s ours) am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit 'b4b83c1cc485d4c9a2e0e7937c5ca179665cae12':
|
2015-08-27 14:23:54 +00:00 |
|
Calin Juravle
|
1175f78eab
|
am 37432589: am 1e76cac9: (-s ours) am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '3743258900e157562d62022ed05fc08d35672125':
|
2015-08-27 14:23:48 +00:00 |
|
Jim Miller
|
79d571cccb
|
am 9282b54f: am b3fa991f: (-s ours) am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev
* commit '9282b54fa7f797b1313b2bc6e3e991dead07b8d0':
|
2015-08-27 14:23:40 +00:00 |
|
Tao Bao
|
7800786263
|
am 941feb6b: am bdc0e13d: (-s ours) am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit '941feb6b79b05bf5c6d91a45031eba81edfaee11':
|
2015-08-27 14:23:27 +00:00 |
|
Thierry Strudel
|
a1432b71cd
|
am 4fcbe635: am a0fbb908: (-s ours) am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit '4fcbe635bfe989b2377d5dec857311a8c37ced47':
|
2015-08-27 14:23:16 +00:00 |
|
Andres Morales
|
32d6ceec25
|
am 792d3c48: am a9515736: (-s ours) am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit '792d3c486a583945c94775dd1eb47f2778e1989b':
|
2015-08-27 14:23:05 +00:00 |
|
Andres Morales
|
4f04c37ca8
|
am c1bdcf56: am c7a8f67e: (-s ours) am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit 'c1bdcf56c08f028e9a1ea660fb99bc3f698c5a52':
|
2015-08-27 14:22:56 +00:00 |
|
Christopher Ferris
|
fb9f84b222
|
am 9dcbe6b1: am a28c0810: (-s ours) am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit '9dcbe6b13f0588e87b1cfa3e0fc293ab66ee3a41':
|
2015-08-27 14:22:36 +00:00 |
|
Pirama Arumuga Nainar
|
cd5f3f2765
|
am 5806ab61: am 2aee3fd8: (-s ours) am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '5806ab61257e0166e0487e1b0ee10d4b2454a2f7':
|
2015-08-27 14:22:13 +00:00 |
|
Dan Albert
|
43799d8bb0
|
am 881f8533: am fcbc32de: (-s ours) am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit '881f853345c19ad282665e16c5f8e55e1c6e9e8f':
|
2015-08-27 14:21:58 +00:00 |
|
Dan Albert
|
610cd583a2
|
am a7d9920f: am f9b81ccd: (-s ours) am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."
* commit 'a7d9920f423b0bf5853884acf6a465c9ba3d0a00':
|
2015-08-27 14:21:38 +00:00 |
|
Elliott Hughes
|
a17f6ba101
|
am aab10418: am d15baf01: (-s ours) am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."
* commit 'aab10418a3958ccc4606523645deb2638f01f9b7':
|
2015-08-27 14:21:17 +00:00 |
|
Christopher Ferris
|
804e9651d8
|
am d02344c9: am 70c1fb87: (-s ours) am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb."
* commit 'd02344c940486a41b9320de9a19fbabd81ced7b7':
|
2015-08-27 14:20:55 +00:00 |
|
Daniel Rosenberg
|
2097231e83
|
am 9c079c94: am a5b671d0: (-s ours) am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img"
* commit '9c079c94d7a6dd1a70a155529c86e11787c06c2d':
|
2015-08-27 14:20:35 +00:00 |
|
Christopher Ferris
|
4c89a3b569
|
am 6f954b7a: am 36fa4226: (-s ours) am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE."
* commit '6f954b7ae2ac671c6bf5433fb47d3912c57c05e6':
|
2015-08-27 14:20:25 +00:00 |
|
Elliott Hughes
|
3db0c32e3f
|
am 90ac2c73: am fd41558c: (-s ours) am dba00aab: am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions."
* commit '90ac2c735611572d2bb789cd9b76e70ea49066fa':
|
2015-08-27 14:20:13 +00:00 |
|
Paul Lawrence
|
b064c8e331
|
am 1695f544: am c011b031: (-s ours) am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit '1695f544d133bc36a1f813baa37b27d76ff82f82':
|
2015-08-27 14:20:08 +00:00 |
|
Andres Morales
|
9485109f5e
|
am b466dc17: am 775b58d0: (-s ours) am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev
* commit 'b466dc1790d98b99cddc7d692f1a7d8eb3b6f8e3':
|
2015-08-27 14:20:02 +00:00 |
|
Mark Salyzyn
|
feb946f0bf
|
am 6c4090f2: am f92c19ee: (-s ours) am 6b6c1bd9: Gracefully handle ENODEV in sdcard daemon (part deux)
* commit '6c4090f215a03ebec37598dec5cea5904414eda8':
|
2015-08-27 14:19:55 +00:00 |
|
Paul Lawrence
|
aeea1caa86
|
am 4604d559: am d3669ff2: (-s ours) am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit '4604d55992369b8e7a516fb09abb90e0367f139d':
|
2015-08-27 14:19:47 +00:00 |
|
Elliott Hughes
|
388da660ca
|
am 15b8b8ad: am 0c3cb52d: (-s ours) am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt"
* commit '15b8b8ad80123dec2995012e6282fb935000d666':
|
2015-08-27 14:19:37 +00:00 |
|
Jeff Sharkey
|
89e0e18068
|
am ab34ed89: am d67d339d: (-s ours) am 25aabb9e: Permission to view shared storage for all users.
* commit 'ab34ed894b61fe825cf8b55fec1eb3b233a014ac':
|
2015-08-27 14:19:18 +00:00 |
|
Elliott Hughes
|
bc8c227529
|
am 1533f95b: (-s ours) am 615af25f: am a421c1e5: Merge "Possible Mac build fix."
* commit '1533f95bbaf2a8895b05d146e578e47d8a69dadd':
|
2015-08-27 11:56:06 +00:00 |
|
Elliott Hughes
|
b3bdac729d
|
am 4f2015a1: (-s ours) am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels."
* commit '4f2015a155175f9da36574a378ce15ed74027ae9':
|
2015-08-27 11:56:04 +00:00 |
|
Ruchi Kandoi
|
6e845ef631
|
am 9e8eb993: (-s ours) am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
* commit '9e8eb9930b39638f7a7fff6b02a86906430cb76f':
|
2015-08-27 11:56:02 +00:00 |
|
Sergio Giro
|
377c094e60
|
am 361d16e7: (-s ours) am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '361d16e7079e4b6e1c27df3f8ccc98b67b74a62f':
|
2015-08-27 11:56:00 +00:00 |
|
Steve Fung
|
c24ead590e
|
am f079143b: (-s ours) am c734ac27: am c3d61786: Merge "crash_reporter: Run with supplemental groups"
* commit 'f079143b298ea050bcbbb8567e0c41ed89059c92':
|
2015-08-27 11:55:57 +00:00 |
|
Elliott Hughes
|
401b41a1a2
|
am 39206a08: (-s ours) am 1ce12d39: am 43f43d87: Merge "Move adb\'s selinux_android_restorecon up and check for failures."
* commit '39206a08d8780da3b15eddaf26918db2682b84b6':
|
2015-08-27 11:55:51 +00:00 |
|
Elliott Hughes
|
afae173360
|
am e4baae6d: (-s ours) am 12d762e1: am e8e272c5: Merge "EINTR is handled by adb_read/unix_read and friends."
* commit 'e4baae6d066c7d39af127a2ba1df5e91475db1a9':
|
2015-08-27 11:55:49 +00:00 |
|
Elliott Hughes
|
ceb0b50f97
|
am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp
* commit '9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9':
|
2015-08-27 11:55:46 +00:00 |
|
Elliott Hughes
|
d4d2f48fa7
|
am 9bc8005e: (-s ours) resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp
* commit '9bc8005e079a1062751b5e9d62afeef3f2407dfb':
|
2015-08-27 11:55:44 +00:00 |
|
Elliott Hughes
|
b62af3eba8
|
am 478bca2e: (-s ours) resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp
* commit '478bca2e728c108158fd68b469b3a48e2a432ad9':
|
2015-08-27 11:55:41 +00:00 |
|
Elliott Hughes
|
d70ddbc520
|
am 9c24c441: (-s ours) am e55e820e: am e13fd9aa: Merge "lsof fixes."
* commit '9c24c4410ce059c87f7dab9160442a340dbd2bbc':
|
2015-08-27 11:55:39 +00:00 |
|
Tom Cherry
|
e038b24c9d
|
am fbe3fa84: (-s ours) am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit 'fbe3fa84ff2564b909eaad4f427d4501bf5eb285':
|
2015-08-27 11:55:37 +00:00 |
|
Elliott Hughes
|
8545944dcf
|
am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."
* commit 'e3bbb2ab00a117bf749d0c7e3072118276c89564':
|
2015-08-27 11:55:35 +00:00 |
|
Nick Kralevich
|
b1736207ff
|
am 2bcb9221: (-s ours) am 7ec4c228: am e80ec0c5: Merge "libutils: Enable LOCAL_SANITIZE := integer"
* commit '2bcb9221d492838c95f4eee3cb65589a3e789b09':
|
2015-08-27 11:55:33 +00:00 |
|
Elliott Hughes
|
6fca44cf22
|
am 201eaa68: (-s ours) am 5c027334: am 93b9e865: Merge "There are no big endian hosts, grandpa."
* commit '201eaa683a5edd79000110e5246353235bb42ab1':
|
2015-08-27 11:55:31 +00:00 |
|
Elliott Hughes
|
8327112798
|
am 6b5f77c9: (-s ours) am c583c511: am 186f1dee: Merge "adb sync cleanup."
* commit '6b5f77c9bb0923e0072651a52a500c8c10b4d32b':
|
2015-08-27 11:55:28 +00:00 |
|
Badhri Jagan Sridharan
|
d9928e9bce
|
am ff490354: (-s ours) am 46f24955: am e3c02883: Merge "adbd: enable USB SuperSpeed (again)"
* commit 'ff490354f495624578dc8feeab2c241f741f8a4b':
|
2015-08-27 11:55:18 +00:00 |
|