Elliott Hughes
|
8a8ae43b08
|
am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"
* commit 'cc07811ebb4f42109ae9ef1414e1a24d8cf54a9d':
|
2015-08-27 11:41:41 +00:00 |
|
Yusuke Sato
|
ed39479f0c
|
am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"
* commit '7c842b57fe5b81802b35b5de1572956981a7ea22':
|
2015-08-27 11:41:22 +00:00 |
|
Elliott Hughes
|
c8e195d672
|
am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."
* commit 'ac6a325e5c2e2c852d4a5375743f17a29a372df9':
|
2015-08-27 11:41:11 +00:00 |
|
Daniel Rosenberg
|
57b3c85134
|
am d2bb8134: (-s ours) am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit 'd2bb8134d337d35c6abfcf57a8a6c754fdba9d45':
|
2015-08-27 11:40:56 +00:00 |
|
Elliott Hughes
|
68b452b9ef
|
am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '0f9b94e21d6db64abaf026e84b544d32364f99bf':
|
2015-08-27 11:40:45 +00:00 |
|
Daniel Erat
|
430e86ca94
|
am cca5c3f1: (-s ours) am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit 'cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa':
|
2015-08-27 11:40:34 +00:00 |
|
Elliott Hughes
|
9ecbf3b8f9
|
am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."
* commit '32cfa9527136665689818399771174b5e25d32ba':
|
2015-08-27 11:40:25 +00:00 |
|
Elliott Hughes
|
94ee3eab00
|
am 546738a4: (-s ours) am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '546738a4e7afbb216876cf65791c87adb0541e7d':
|
2015-08-27 11:40:07 +00:00 |
|
Elliott Hughes
|
c826b5b064
|
am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit 'cb599d34b94d638d8fca6aee267e006e7d68d663':
|
2015-08-27 11:40:00 +00:00 |
|
Jeff Sharkey
|
1d87302df6
|
am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.
* commit 'f1e44bb9c60d63c7e05212b85803808c4142d785':
|
2015-08-27 11:39:54 +00:00 |
|
Elliott Hughes
|
e455dff013
|
am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit '7e71d42701e6ad78d4327db40ef7d34e1e75c1e2':
|
2015-08-27 11:39:49 +00:00 |
|
Elliott Hughes
|
faa14c2eec
|
am e45a6650: (-s ours) am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'e45a665040bfd317d9ed36ecac64a33d951e1fd7':
|
2015-08-27 11:39:37 +00:00 |
|
Nick Kralevich
|
d09d1ff37c
|
am 64be1683: (-s ours) am d9bb7852: am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit '64be1683689b0f0ccac04aab44c3b7d743cd2327':
|
2015-08-27 11:39:31 +00:00 |
|
Sami Tolvanen
|
0405485c79
|
am 5f2b3b4b: (-s ours) am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '5f2b3b4be8a769d9eea836a21e6e077cd526d3a0':
|
2015-08-27 11:39:27 +00:00 |
|
Daniel Rosenberg
|
861dfa7917
|
am be92912d: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit 'be92912d1adca8954bc81dbd03e8e1635154957e':
|
2015-08-27 11:39:22 +00:00 |
|
Daniel Rosenberg
|
b94b4f1ad5
|
am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
* commit '15db3551d005a58407a8ac97b73a879530dd3e74':
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp
|
2015-08-27 11:39:18 +00:00 |
|
Daniel Rosenberg
|
b4bb346e4c
|
am 6b6687be: (-s ours) am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc"
* commit '6b6687bec97bb325f21fc9bfde8256430b55cc3c':
|
2015-08-27 11:39:14 +00:00 |
|
Daniel Rosenberg
|
b4943598bc
|
am cdf768fe: (-s ours) am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"
* commit 'cdf768fe7c13f1dfae2bde6fb6d32b8400d56393':
|
2015-08-27 11:39:10 +00:00 |
|
Yin-Chia Yeh
|
b4b83c1cc4
|
am 84cf943a: (-s ours) am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit '84cf943afb0d3e2817939db31aa7effb1ac4af8d':
|
2015-08-27 11:39:06 +00:00 |
|
Calin Juravle
|
3743258900
|
am 1e76cac9: (-s ours) am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '1e76cac936fd47df26a65929f812277207a47462':
|
2015-08-27 11:39:01 +00:00 |
|
Jim Miller
|
9282b54fa7
|
am b3fa991f: (-s ours) am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev
* commit 'b3fa991fecb9db3161023798601c28bc9af70d3e':
|
2015-08-27 11:38:53 +00:00 |
|
Tao Bao
|
941feb6b79
|
am bdc0e13d: (-s ours) am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit 'bdc0e13d2053c36384c102161b7346fd5fb007a3':
|
2015-08-27 11:38:46 +00:00 |
|
Thierry Strudel
|
4fcbe635bf
|
am a0fbb908: (-s ours) am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit 'a0fbb908855d2476f5dd86c8172177f1c08d1428':
|
2015-08-27 11:38:37 +00:00 |
|
Andres Morales
|
792d3c486a
|
am a9515736: (-s ours) am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit 'a9515736e9c147bfa41235088b3bf2899aa8bd5f':
|
2015-08-27 11:38:26 +00:00 |
|
Andres Morales
|
c1bdcf56c0
|
am c7a8f67e: (-s ours) am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit 'c7a8f67e425d286a9eba4a9716ea2590b8752f90':
|
2015-08-27 11:38:16 +00:00 |
|
Christopher Ferris
|
9dcbe6b13f
|
am a28c0810: (-s ours) am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit 'a28c0810d3ba0664974d533d00a907107eb9be07':
|
2015-08-27 11:37:58 +00:00 |
|
Pirama Arumuga Nainar
|
5806ab6125
|
am 2aee3fd8: (-s ours) am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '2aee3fd843138b22f34dc7249c2a2c13a4a49550':
|
2015-08-27 11:37:48 +00:00 |
|
Dan Albert
|
881f853345
|
am fcbc32de: (-s ours) am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit 'fcbc32de34ceea570824b98f243d40a228df1989':
|
2015-08-27 11:37:29 +00:00 |
|
Dan Albert
|
a7d9920f42
|
am f9b81ccd: (-s ours) am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."
* commit 'f9b81ccd7560deeade1f8bfc3fedbd5a1b460986':
|
2015-08-27 11:37:22 +00:00 |
|
Elliott Hughes
|
aab10418a3
|
am d15baf01: (-s ours) am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."
* commit 'd15baf01806834699285e6b788a2963c1062084e':
|
2015-08-27 11:37:16 +00:00 |
|
Christopher Ferris
|
d02344c940
|
am 70c1fb87: (-s ours) am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb."
* commit '70c1fb87e81bbdd389cdb42790469cb1bd7b7ff1':
|
2015-08-27 11:37:10 +00:00 |
|
Daniel Rosenberg
|
9c079c94d7
|
am a5b671d0: (-s ours) am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img"
* commit 'a5b671d0e38d171105b4c76f5671c2c62549d831':
|
2015-08-27 11:37:06 +00:00 |
|
Christopher Ferris
|
6f954b7ae2
|
am 36fa4226: (-s ours) am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE."
* commit '36fa42262d4642eb1bb55b39f68ae17a39a1698a':
|
2015-08-27 11:37:00 +00:00 |
|
Elliott Hughes
|
90ac2c7356
|
am fd41558c: (-s ours) am dba00aab: am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions."
* commit 'fd41558c66553ca85229e1a5f06196d9cf6b52e5':
|
2015-08-27 11:36:54 +00:00 |
|
Paul Lawrence
|
1695f544d1
|
am c011b031: (-s ours) am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit 'c011b031c988038f81c72875fdd6ac7349774f35':
|
2015-08-27 11:36:49 +00:00 |
|
Andres Morales
|
b466dc1790
|
am 775b58d0: (-s ours) am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev
* commit '775b58d08f207cc1752deca50e4526f19ac14583':
|
2015-08-27 11:36:45 +00:00 |
|
Mark Salyzyn
|
6c4090f215
|
am f92c19ee: (-s ours) am 6b6c1bd9: Gracefully handle ENODEV in sdcard daemon (part deux)
* commit 'f92c19ee33006aff0f541e9142801648dccd6fd3':
|
2015-08-27 11:36:41 +00:00 |
|
Paul Lawrence
|
4604d55992
|
am d3669ff2: (-s ours) am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit 'd3669ff27f782ce1da324f0a6043204a3a4e9f3f':
|
2015-08-27 11:36:36 +00:00 |
|
Elliott Hughes
|
15b8b8ad80
|
am 0c3cb52d: (-s ours) am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt"
* commit '0c3cb52dfc358cd6d6e01062e7cff50fb98e93d0':
|
2015-08-27 11:36:32 +00:00 |
|
Jeff Sharkey
|
ab34ed894b
|
am d67d339d: (-s ours) am 25aabb9e: Permission to view shared storage for all users.
* commit 'd67d339dab90690949b9344490310e7ded448cb0':
|
2015-08-27 11:36:27 +00:00 |
|
Bart Sears
|
7465c368f3
|
am 8bc53c12: am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
* commit '8bc53c125ab739db7bd34bd3b5c496c3f3a542f9':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
|
2015-08-27 04:53:23 +00:00 |
|
Bart Sears
|
8bc53c125a
|
am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
* commit 'd239dbb2578ca70cb4cd44b78a0295bdd8af0e36':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
|
2015-08-27 01:37:47 +00:00 |
|
Bart Sears
|
d239dbb257
|
am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
|
2015-08-27 01:27:29 +00:00 |
|
Abhishek Arya
|
de19de0ce5
|
am 15361abe: am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
* commit '15361abe395a89c725fb99dfdec036283c5df8bf':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
|
2015-08-26 20:32:07 +00:00 |
|
Abhishek Arya
|
15361abe39
|
am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
* commit '5b33306dba456ec906f7c9bd522681c1de137f78':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
|
2015-08-26 20:11:09 +00:00 |
|
Abhishek Arya
|
5b33306dba
|
Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
|
2015-08-26 20:06:19 +00:00 |
|
Bart Sears
|
170bde83ae
|
resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
Change-Id: I236367bd60046ba06669cbcdae81184f9d0a74c7
|
2015-08-26 12:59:28 -07:00 |
|
Yabin Cui
|
bc4942284d
|
am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread."
* commit 'f03aa6670e39ef1a46211960d134b2528a3649f5':
adb: keep all asocket operations in the main thread.
|
2015-08-26 19:59:02 +00:00 |
|
Yabin Cui
|
f03aa6670e
|
am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread."
* commit 'fbdd5ee2f6d35f8fde53c37e0ef83765aa7f5981':
adb: keep all asocket operations in the main thread.
|
2015-08-26 19:46:37 +00:00 |
|
Yabin Cui
|
fbdd5ee2f6
|
Merge "adb: keep all asocket operations in the main thread."
|
2015-08-26 19:40:54 +00:00 |
|