Oleksiy Avramchenko
|
79f7c9ca43
|
Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a am: 8a96f5e4a7
am: ac7bdd6a07
Change-Id: I0490d5194ecf223969b8baa95b8d61381bfbeed4
|
2016-11-30 17:12:39 +00:00 |
|
Oleksiy Avramchenko
|
ac7bdd6a07
|
Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a
am: 8a96f5e4a7
Change-Id: I458817e1ba2407bb35d0d9dc5c9c913f40bab6d5
|
2016-11-30 17:07:07 +00:00 |
|
Oleksiy Avramchenko
|
8a96f5e4a7
|
Merge "logcat: Fix --last usage option typo"
am: 95a53b8b7a
Change-Id: Ic18c2cec4c72cd97353c22f9e41c926baac8085b
|
2016-11-30 17:01:37 +00:00 |
|
Treehugger Robot
|
95a53b8b7a
|
Merge "logcat: Fix --last usage option typo"
|
2016-11-30 16:55:23 +00:00 |
|
Mark Salyzyn
|
e81915ee89
|
Merge "liblog: CTS test" am: f1f7333e7c am: 815e0bd6fa
am: 6e69c8fea6
Change-Id: Ia83079e8296c3b4bcff6f93ed8a14618fa296dd2
|
2016-11-30 16:45:07 +00:00 |
|
Mark Salyzyn
|
6e69c8fea6
|
Merge "liblog: CTS test" am: f1f7333e7c
am: 815e0bd6fa
Change-Id: I1e33427d08b02c4128341ac98c3ce584db694b4f
|
2016-11-30 16:39:06 +00:00 |
|
Mark Salyzyn
|
815e0bd6fa
|
Merge "liblog: CTS test"
am: f1f7333e7c
Change-Id: I400e7c1aa53fd431102bff843e672ee1fe49e8f7
|
2016-11-30 16:34:05 +00:00 |
|
Treehugger Robot
|
f1f7333e7c
|
Merge "liblog: CTS test"
|
2016-11-30 16:25:11 +00:00 |
|
Mark Salyzyn
|
72b701449c
|
Merge "liblog: event_tag_map benchmark" am: 4afb3ef952 am: 6b4a2ec603
am: 966b078715
Change-Id: Ib56cbd7b060484cfe56d65cc425a4109ef3ffd31
|
2016-11-30 15:49:03 +00:00 |
|
Mark Salyzyn
|
966b078715
|
Merge "liblog: event_tag_map benchmark" am: 4afb3ef952
am: 6b4a2ec603
Change-Id: I0cdf5e13ec1c291d4dba1bf06f7df538c8389f53
|
2016-11-30 15:43:03 +00:00 |
|
Mark Salyzyn
|
6b4a2ec603
|
Merge "liblog: event_tag_map benchmark"
am: 4afb3ef952
Change-Id: I986ef28441dc87f2ade0fd50ffceeb0a4beddf88
|
2016-11-30 15:37:33 +00:00 |
|
Treehugger Robot
|
4afb3ef952
|
Merge "liblog: event_tag_map benchmark"
|
2016-11-30 15:31:11 +00:00 |
|
Oleksiy Avramchenko
|
39e2d22b93
|
logcat: Fix --last usage option typo
Test: mm
Change-Id: I0b7a1615857acd4cd467f1ff1752eeae86d84eca
|
2016-11-30 13:42:14 +01:00 |
|
Nick Kralevich
|
df9b817177
|
Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09 am: 84ccb2dbe0
am: 376aa73945
Change-Id: I94067e2846c7ebcd422d8200164f8bea81748eb7
|
2016-11-30 09:29:40 +00:00 |
|
Richard Uhler
|
75eea836bf
|
Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32 am: 3ff028c7db
am: 8035a63a38
Change-Id: Ic7c4d23b103a652947d01c4ebb5b43845c8f1e0e
|
2016-11-30 09:29:26 +00:00 |
|
Nick Kralevich
|
376aa73945
|
Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09
am: 84ccb2dbe0
Change-Id: I87dea345156be3f0745e4df513b725fa451823b3
|
2016-11-30 09:24:14 +00:00 |
|
Richard Uhler
|
8035a63a38
|
Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32
am: 3ff028c7db
Change-Id: If0dae1f04f63d113f6414e21bcceee751f7de5c9
|
2016-11-30 09:23:56 +00:00 |
|
Nick Kralevich
|
84ccb2dbe0
|
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
am: d91e35fb09
Change-Id: I97fcb4d10ae1a724fc24588f1ee3b0e783d40a62
|
2016-11-30 09:19:16 +00:00 |
|
Richard Uhler
|
3ff028c7db
|
Merge "debuggerd: Dump list of open files on process crash."
am: b675f7cd32
Change-Id: Iec231fc7eb57fa2c51aabc0fb75b4a09c47004cd
|
2016-11-30 09:18:57 +00:00 |
|
Treehugger Robot
|
d91e35fb09
|
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
|
2016-11-30 07:54:48 +00:00 |
|
Treehugger Robot
|
b675f7cd32
|
Merge "debuggerd: Dump list of open files on process crash."
|
2016-11-30 07:53:09 +00:00 |
|
Dan Willemsen
|
d92abae3f0
|
Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641 am: 695e6182d3
am: fa807c7cad
Change-Id: I9ece6f1ce09097d93fe46d07c323c4dd6977839d
|
2016-11-30 06:17:15 +00:00 |
|
Dan Willemsen
|
dd592909c0
|
Enable liblog on host bionic am: 0910d2dbb9 am: 32010171bd
am: fb1a1dbe6c
Change-Id: Idb398d60741a13e9027a8968c15c413cb1c16439
|
2016-11-30 06:17:08 +00:00 |
|
Dan Willemsen
|
55d4de90a6
|
Enable libbase/libutils/libziparchive on host bionic am: ab34b47b35 am: 69b0123549
am: 5bc670c841
Change-Id: I3eebdfc8d018518ff0d3b1b0e46c2514af3d1324
|
2016-11-30 06:17:00 +00:00 |
|
Dan Willemsen
|
fa807c7cad
|
Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641
am: 695e6182d3
Change-Id: Ib3ef2009d60445b1c3e1eb46a44471236df89fa7
|
2016-11-30 06:12:15 +00:00 |
|
Dan Willemsen
|
fb1a1dbe6c
|
Enable liblog on host bionic am: 0910d2dbb9
am: 32010171bd
Change-Id: I8d4c144679670f9b58e9b258626cf03459af85a3
|
2016-11-30 06:12:07 +00:00 |
|
Dan Willemsen
|
5bc670c841
|
Enable libbase/libutils/libziparchive on host bionic am: ab34b47b35
am: 69b0123549
Change-Id: Ib9c0d6d9912617c95c75018248b069e254bcdb11
|
2016-11-30 06:12:00 +00:00 |
|
Dan Willemsen
|
695e6182d3
|
Merge changes Ia0ca36fc,Ib42c0635
am: 1abc3cd641
Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0
|
2016-11-30 06:06:07 +00:00 |
|
Dan Willemsen
|
32010171bd
|
Enable liblog on host bionic
am: 0910d2dbb9
Change-Id: I127b74998a678bc69c70cabcbdcf5586feb80172
|
2016-11-30 06:06:06 +00:00 |
|
Dan Willemsen
|
69b0123549
|
Enable libbase/libutils/libziparchive on host bionic
am: ab34b47b35
Change-Id: If8e762eace58a494efede9ef5cb09be99b74e5b8
|
2016-11-30 06:05:59 +00:00 |
|
Treehugger Robot
|
1abc3cd641
|
Merge changes Ia0ca36fc,Ib42c0635
* changes:
Enable liblog on host bionic
Enable libbase/libutils/libziparchive on host bionic
|
2016-11-30 05:59:53 +00:00 |
|
Daniel Rosenberg
|
5ef19d04de
|
Merge "Switch sdcardfs over to bind mounts." am: 94b9e4df04 am: 895cd44bd9
am: 8c0d6338f3
Change-Id: I0c99299b107e7ab504de817059216216bfb9c7d8
|
2016-11-30 05:32:09 +00:00 |
|
Daniel Rosenberg
|
8c0d6338f3
|
Merge "Switch sdcardfs over to bind mounts." am: 94b9e4df04
am: 895cd44bd9
Change-Id: I33328d236f0ccfb9f65cfdc90d626a8561c032a1
|
2016-11-30 05:26:10 +00:00 |
|
Daniel Rosenberg
|
895cd44bd9
|
Merge "Switch sdcardfs over to bind mounts."
am: 94b9e4df04
Change-Id: I2dc89613d382ea5fd86bd1a1736310d3e8e49dbc
|
2016-11-30 05:20:40 +00:00 |
|
Treehugger Robot
|
94b9e4df04
|
Merge "Switch sdcardfs over to bind mounts."
|
2016-11-30 05:15:33 +00:00 |
|
Nick Kralevich
|
ef400b2162
|
Merge "delete toolbox/r.c" am: 08f0c4c998 am: 604ed83934
am: 1523ff3952
Change-Id: I9710424d7544bcdf9a3e09f452993f747a1b6c05
|
2016-11-30 04:42:54 +00:00 |
|
Nick Kralevich
|
1523ff3952
|
Merge "delete toolbox/r.c" am: 08f0c4c998
am: 604ed83934
Change-Id: I501fbb275af584fdc60bfde9c3b13cc75c3d6f27
|
2016-11-30 04:37:54 +00:00 |
|
Nick Kralevich
|
604ed83934
|
Merge "delete toolbox/r.c"
am: 08f0c4c998
Change-Id: I2725b81599d2b90473a96e0748911ca3bbf46211
|
2016-11-30 04:32:54 +00:00 |
|
Treehugger Robot
|
08f0c4c998
|
Merge "delete toolbox/r.c"
|
2016-11-30 04:27:32 +00:00 |
|
Josh Gao
|
025a447a80
|
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d am: 79517d4f9f
am: effc9de94a
Change-Id: Idd627ca6b4f73f0141a26b0024cb218ea3bec7c5
|
2016-11-30 03:30:04 +00:00 |
|
Josh Gao
|
43fbfbdb54
|
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 am: 8dab84a673
am: d85207481e
Change-Id: Ibbf9eea0ce1b4227f8ab220424323cb11c01d782
|
2016-11-30 03:29:48 +00:00 |
|
Prashant Malani
|
ddc80bd771
|
fs_mgr: Fix disable-verity for verifyatboot partitions am: dd78ae75ff
am: cfbf6d71a9
Change-Id: I5376ff2fb4f49f49d50a19e707c7d1e0690b8c55
|
2016-11-30 03:29:32 +00:00 |
|
Josh Gao
|
cc2d0c06e8
|
Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 am: b928a3485a
am: 641a541a6f
Change-Id: I407b741d9027bb7bf1e268070d882440efccf13b
|
2016-11-30 03:29:10 +00:00 |
|
Josh Gao
|
c8dada7576
|
adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82 am: a198e406c8
am: f3e0563949
Change-Id: I30d523ffa9576c2f075c175745097f70978fcd7a
|
2016-11-30 03:28:52 +00:00 |
|
Tianjie Xu
|
ac0fdce7cb
|
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours am: 778fff4ae8 am: 4e37d97d61 am: 0735bfdd3a am: d540186b0d -s ours am: f6e21cb1f8 am: dd11742510 am: 4f99cb9cb9 am: 268bdfb840
am: 1ff7b760e7
Change-Id: I9173f9ceca5479a3cbe4151a9a78a239af9ffad7
|
2016-11-30 03:28:32 +00:00 |
|
Tianjie Xu
|
d68d20e073
|
Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130 am: 80dc7605b9
am: 8727b53a2f
Change-Id: I5b603d29528d6cb6eb0ee8c734a1ed9273fe094d
|
2016-11-30 03:28:17 +00:00 |
|
Tianjie Xu
|
2422a0db5b
|
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428 am: c706c7ffcc
am: 5a97ef91d8
Change-Id: I613ef805bc6d4a59f05b89032490fb90c2c2bab7
|
2016-11-30 03:28:02 +00:00 |
|
Tom Cherry
|
f19a1fcc90
|
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
am: 524afcec4a
Change-Id: I80326f8588a36674d0016df12e4f5f5f70c999a3
|
2016-11-30 03:27:47 +00:00 |
|
Josh Gao
|
effc9de94a
|
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d
am: 79517d4f9f
Change-Id: I8d7b80219e3292bbca47626f89c66c512a80abd2
|
2016-11-30 03:24:30 +00:00 |
|
Josh Gao
|
d85207481e
|
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280
am: 8dab84a673
Change-Id: I34dae711685efe971b6161d41e59a1738a758b28
|
2016-11-30 03:24:14 +00:00 |
|