Brian C. Anderson
|
eccaae3659
|
Merge "Update native_window_get_frame_timestamps args"
|
2017-01-17 01:09:47 +00:00 |
|
Elliott Hughes
|
96eec68729
|
Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93 am: ed67c75206 am: 1b4ef805b1
am: 5c25f72e24
Change-Id: I03171bd29805c5073a2bf46135db0b5d1841e490
|
2017-01-16 18:50:43 +00:00 |
|
Elliott Hughes
|
5c25f72e24
|
Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93 am: ed67c75206
am: 1b4ef805b1
Change-Id: I305cf0b3df95433d387f306daac774fa13d0854f
|
2017-01-16 18:27:32 +00:00 |
|
Elliott Hughes
|
1b4ef805b1
|
Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93
am: ed67c75206
Change-Id: I678bb3273f427eb6ae86b3ae553d64e612ab04a4
|
2017-01-16 18:22:32 +00:00 |
|
Elliott Hughes
|
ed67c75206
|
Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry."
am: c160675a93
Change-Id: Ic8e6d589d3a6bbc630202356d85851ed5729e22c
|
2017-01-16 18:18:03 +00:00 |
|
Treehugger Robot
|
c160675a93
|
Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry."
|
2017-01-16 18:10:46 +00:00 |
|
Elliott Hughes
|
ebeaa67c0c
|
Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry.
Bug: N/A
Test: builds
Change-Id: Icaf095f0c25fae5c1175dbb630bc05c63af72d75
|
2017-01-15 11:52:35 -08:00 |
|
Elliott Hughes
|
72edb4c02c
|
Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e am: e7c8bb473e am: 4b7ba78fe2
am: 8d47d408fb
Change-Id: Id5a6203edd7d52faae0eed8be244364153fa6956
|
2017-01-14 18:46:13 +00:00 |
|
Elliott Hughes
|
8d47d408fb
|
Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e am: e7c8bb473e
am: 4b7ba78fe2
Change-Id: I794386ae55a3faf0c6bc087dc77405e10244bc48
|
2017-01-14 18:32:20 +00:00 |
|
Elliott Hughes
|
4b7ba78fe2
|
Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e
am: e7c8bb473e
Change-Id: I07552a5fa16fc66b6379f6b44a97f59e1b712b7a
|
2017-01-14 18:29:20 +00:00 |
|
Elliott Hughes
|
e7c8bb473e
|
Merge "bootable/recovery wants EqualsIgnoreCase."
am: 89e99f9e0e
Change-Id: Id7480e1a1fec5626a0bec22c2128dd419533e1aa
|
2017-01-14 18:26:21 +00:00 |
|
Elliott Hughes
|
89e99f9e0e
|
Merge "bootable/recovery wants EqualsIgnoreCase."
|
2017-01-14 18:22:32 +00:00 |
|
Hung-ying Tyan
|
d476607b98
|
Merge "init: add ro.boot.init_rc" am: 0cf5e36c00 am: 1d1b981f95 am: a83586c1ed
am: 1f873c02e2
Change-Id: I0a68323c62993b2b9ead37a16e99bc0181820c45
|
2017-01-14 08:27:21 +00:00 |
|
Hung-ying Tyan
|
1f873c02e2
|
Merge "init: add ro.boot.init_rc" am: 0cf5e36c00 am: 1d1b981f95
am: a83586c1ed
Change-Id: Iaab9d1b4cc1055a91624815463a656e6fce8621b
|
2017-01-14 08:17:08 +00:00 |
|
Hung-ying Tyan
|
a83586c1ed
|
Merge "init: add ro.boot.init_rc" am: 0cf5e36c00
am: 1d1b981f95
Change-Id: If7afdc62ddea990a00713c548575c945a73022e4
|
2017-01-14 08:14:09 +00:00 |
|
Hung-ying Tyan
|
1d1b981f95
|
Merge "init: add ro.boot.init_rc"
am: 0cf5e36c00
Change-Id: I14b7e7d7bb7d98fac9126a0a1e624bb180529028
|
2017-01-14 08:11:37 +00:00 |
|
Treehugger Robot
|
0cf5e36c00
|
Merge "init: add ro.boot.init_rc"
|
2017-01-14 08:06:09 +00:00 |
|
Elliott Hughes
|
58801ba703
|
Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93 am: cf24be99bb
am: 13b71453fa
Change-Id: I302fce455320318598d573739cd0ebee4ee499bb
|
2017-01-14 03:02:55 +00:00 |
|
Elliott Hughes
|
13b71453fa
|
Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93
am: cf24be99bb
Change-Id: I7d3bd8f949d4b7607747916b541b8c2b80807598
|
2017-01-14 03:00:24 +00:00 |
|
Elliott Hughes
|
cf24be99bb
|
Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74
am: 5bdade8a93
Change-Id: I0ca6a8824a2f89867e85fea6ee8d97f6dd3a1acf
|
2017-01-14 02:57:53 +00:00 |
|
Elliott Hughes
|
2140782d24
|
bootable/recovery wants EqualsIgnoreCase.
Bug: N/A
Test: ran tests
Change-Id: I4a6ee9eba0514b8bb8fb0489f4d370964ce9c1c2
|
2017-01-13 18:51:32 -08:00 |
|
Elliott Hughes
|
5bdade8a93
|
Merge "-e is really about TCP/IP devices, not emulators."
am: f28f7c8a74
Change-Id: I9c15948b84956030eec73358cc6454ed8a16d9bc
|
2017-01-14 02:51:22 +00:00 |
|
Treehugger Robot
|
f28f7c8a74
|
Merge "-e is really about TCP/IP devices, not emulators."
|
2017-01-14 02:47:21 +00:00 |
|
Elliott Hughes
|
a6a0029bbe
|
Merge "Switch fastboot docs to markdown." am: e94deb3a51 am: b095bf0cf9 am: b21ae4f2d1
am: 539abc8d8d
Change-Id: I8c1400de8be3d371a244a778e2320883ebe792cc
|
2017-01-14 02:34:21 +00:00 |
|
Elliott Hughes
|
539abc8d8d
|
Merge "Switch fastboot docs to markdown." am: e94deb3a51 am: b095bf0cf9
am: b21ae4f2d1
Change-Id: I325fe41a36fad6477b01fb3bfb8b56fb1c953855
|
2017-01-14 02:31:51 +00:00 |
|
Elliott Hughes
|
b21ae4f2d1
|
Merge "Switch fastboot docs to markdown." am: e94deb3a51
am: b095bf0cf9
Change-Id: Ic24455280f62447c2697d2476debe446d1a50e1c
|
2017-01-14 02:29:50 +00:00 |
|
Elliott Hughes
|
b095bf0cf9
|
Merge "Switch fastboot docs to markdown."
am: e94deb3a51
Change-Id: Ib9e354ecde88cfe914e95b5ab1e2ab41aad8022d
|
2017-01-14 02:26:51 +00:00 |
|
Elliott Hughes
|
e94deb3a51
|
Merge "Switch fastboot docs to markdown."
|
2017-01-14 02:23:44 +00:00 |
|
Elliott Hughes
|
83ab5c29c1
|
-e is really about TCP/IP devices, not emulators.
Despite the name.
Bug: N/A
Test: N/A
Change-Id: I099222137fabf68f961a6a2e5d11f2904ffd5a0d
|
2017-01-13 16:58:25 -08:00 |
|
Elliott Hughes
|
84cb36e02d
|
Switch fastboot docs to markdown.
Bug: N/A
Test: N/A
Change-Id: I4713c692f67e1aaba079819a6876d0c7bb94f925
|
2017-01-13 16:03:13 -08:00 |
|
Elliott Hughes
|
f6fedf3a0c
|
Merge "Fix libbase file.Readlink test on marlin/sailfish." am: 3052d123a8 am: e8250c0702 am: d8085aede5
am: 5f72ceb114
Change-Id: Ifb1fea264d14e67948d5d9fef4c49e6657dbe855
|
2017-01-13 21:52:46 +00:00 |
|
Elliott Hughes
|
5f72ceb114
|
Merge "Fix libbase file.Readlink test on marlin/sailfish." am: 3052d123a8 am: e8250c0702
am: d8085aede5
Change-Id: I22b5041e89362267d32d57ed55cd245d0b67684d
|
2017-01-13 21:30:46 +00:00 |
|
Elliott Hughes
|
d8085aede5
|
Merge "Fix libbase file.Readlink test on marlin/sailfish." am: 3052d123a8
am: e8250c0702
Change-Id: Ie2a40317a617261cc57621d82a32cd7b5428537e
|
2017-01-13 21:20:29 +00:00 |
|
Elliott Hughes
|
e8250c0702
|
Merge "Fix libbase file.Readlink test on marlin/sailfish."
am: 3052d123a8
Change-Id: I54cf0e2f4adc1786bff40e3fa5b5f97e9c7514d6
|
2017-01-13 21:18:30 +00:00 |
|
Elliott Hughes
|
3052d123a8
|
Merge "Fix libbase file.Readlink test on marlin/sailfish."
|
2017-01-13 21:12:21 +00:00 |
|
TreeHugger Robot
|
6078f6b92a
|
Merge "storaged: replace kmsg with LOG macros"
|
2017-01-13 20:37:06 +00:00 |
|
Elliott Hughes
|
36c857f18c
|
Merge "Move to .md files for even trivial documentation." am: 5d05d0e74e am: 84f52c10a5 am: f4b14761fd
am: b7df390f71
Change-Id: I1b1e3b0aa678724c48f4b91bfad58222f44ba132
|
2017-01-13 19:55:56 +00:00 |
|
Elliott Hughes
|
b7df390f71
|
Merge "Move to .md files for even trivial documentation." am: 5d05d0e74e am: 84f52c10a5
am: f4b14761fd
Change-Id: I438f4437286f1b7aded0d506dddff38ac772c12a
|
2017-01-13 19:53:59 +00:00 |
|
Elliott Hughes
|
f4b14761fd
|
Merge "Move to .md files for even trivial documentation." am: 5d05d0e74e
am: 84f52c10a5
Change-Id: I1e429d8695479469c6643280f60e21032086ab5d
|
2017-01-13 19:43:54 +00:00 |
|
Elliott Hughes
|
84f52c10a5
|
Merge "Move to .md files for even trivial documentation."
am: 5d05d0e74e
Change-Id: If8300cc2d2928520bfe19b36c4fea83cd9558b7a
|
2017-01-13 19:41:53 +00:00 |
|
Treehugger Robot
|
5d05d0e74e
|
Merge "Move to .md files for even trivial documentation."
|
2017-01-13 19:39:26 +00:00 |
|
Jin Qian
|
535ddbe2c9
|
storaged: replace kmsg with LOG macros
Also convert android_log_event to C++ style calls.
Change-Id: I7d62c81789fe7925fe9cae3e2a798b6af8c8be9d
|
2017-01-13 19:02:23 +00:00 |
|
bowgotsai
|
fad8160c34
|
Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4 am: 538cef7b48 am: e7914cbf59
am: 3c79b63ff4
Change-Id: I6c61c76706bcf8b454faa1822f788bb8b5886b55
|
2017-01-13 18:23:58 +00:00 |
|
Jorge Lucangeli Obes
|
d9927a0143
|
Merge "Check the return value of setuid(2)." am: 155d2bcb7a am: 4503269951 am: 4d7df0ffe5
am: ee5d1563f4
Change-Id: Ic9723b2fffc5830f5dc9e81095ec15afe97ad6f8
|
2017-01-13 18:23:47 +00:00 |
|
bowgotsai
|
3c79b63ff4
|
Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4 am: 538cef7b48
am: e7914cbf59
Change-Id: Ibad5cf498cda4daa8cdd6b0a81a05cda71782f10
|
2017-01-13 18:21:32 +00:00 |
|
Jorge Lucangeli Obes
|
ee5d1563f4
|
Merge "Check the return value of setuid(2)." am: 155d2bcb7a am: 4503269951
am: 4d7df0ffe5
Change-Id: I476fbb57e0beb524bd9d768f609a4c70ed50dcaa
|
2017-01-13 18:21:20 +00:00 |
|
bowgotsai
|
e7914cbf59
|
Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4
am: 538cef7b48
Change-Id: I583a46b55ffc392da6e94eb0f2e156fadf4acd2e
|
2017-01-13 18:10:57 +00:00 |
|
Jorge Lucangeli Obes
|
4d7df0ffe5
|
Merge "Check the return value of setuid(2)." am: 155d2bcb7a
am: 4503269951
Change-Id: I2fc84f80f38f1afdddbdb4f7c1ca6ec0fe25f29d
|
2017-01-13 18:10:46 +00:00 |
|
bowgotsai
|
538cef7b48
|
Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp"
am: 8c301d22e4
Change-Id: I74645eef0fbb6ad5ebbc565f2e7b848bbd200959
|
2017-01-13 18:01:58 +00:00 |
|
Jorge Lucangeli Obes
|
4503269951
|
Merge "Check the return value of setuid(2)."
am: 155d2bcb7a
Change-Id: I6d2a0d65d21d525c411d142cfdd29b660ec2fab0
|
2017-01-13 18:01:45 +00:00 |
|