Hsin-Yi Chen
|
7234d5e230
|
Merge "Add tags to lsdump_paths.txt" am: 7205361315 am: a489b755a0 am: c5a074798f am: a44dbe5443
am: 8c2ff18afc
Change-Id: I253e700ffa1c5ed41b07b9dd4c07be09907e1430
|
2019-08-14 20:23:52 -07:00 |
|
Hsin-Yi Chen
|
8c2ff18afc
|
Merge "Add tags to lsdump_paths.txt" am: 7205361315 am: a489b755a0 am: c5a074798f
am: a44dbe5443
Change-Id: I59994a1213c5e3278e5ebf49bd0ca154ace5a9de
|
2019-08-14 20:13:49 -07:00 |
|
Hsin-Yi Chen
|
a44dbe5443
|
Merge "Add tags to lsdump_paths.txt" am: 7205361315 am: a489b755a0
am: c5a074798f
Change-Id: I8de9939fe9dddc1b4228801accba8ac7aadb5617
|
2019-08-14 20:03:42 -07:00 |
|
Paul Scovanner
|
5774856170
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 36c17b8465 am: 1e15d33232
am: cb6234b6df -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbdcc7c00f61f2fa8b9c05766d3d782906e192c8
|
2019-08-14 20:03:29 -07:00 |
|
Paul Scovanner
|
9cac2a2326
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 5140669795 am: 0cafcd40dc
am: 61dfcf7964 -s ours
am skip reason: subject contains skip directive
Change-Id: I661cc2c9f3cbc3ca0a8e6e4b3676c6359320be0d
|
2019-08-14 19:57:42 -07:00 |
|
Paul Scovanner
|
0f6f13d207
|
Merge "Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2" into qt-r1-dev-plus-aosp am: 2021b3bc8e" into qt-qpr1-dev-plus-aosp
am: bbe3ffa293
Change-Id: Idfa2d21f593767c4809d9314533c27af0c760056
|
2019-08-14 19:56:57 -07:00 |
|
Paul Scovanner
|
bcb897a26e
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 5140669795 am: d77b00d4d0
am: 268197b376 -s ours
am skip reason: subject contains skip directive
Change-Id: I3e9f1c3c56b2325809a792cd6ae67b75fbca8ea8
|
2019-08-14 19:56:16 -07:00 |
|
Paul Scovanner
|
460cf44064
|
Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2 am: 50fa3d0d19" into qt-qpr1-dev-plus-aosp
am: 30114759cb
Change-Id: Ia118034c9c35ade8f8efbb06e257512f3f8e8cde
|
2019-08-14 19:55:22 -07:00 |
|
Paul Scovanner
|
3dc48fb48c
|
Update Security Strings to 2019-10-05 am: 84633edb22 am: b6ef08709f am: 28a43e18c7
am: d9cdf3078b
Change-Id: Icad8e87d0404dbe75b16f12dcb6ad9e73334557f
|
2019-08-14 19:54:27 -07:00 |
|
Hsin-Yi Chen
|
c5a074798f
|
Merge "Add tags to lsdump_paths.txt" am: 7205361315
am: a489b755a0
Change-Id: Iff9f0a21911dcd0478e93eab5452f0d6263af990
|
2019-08-14 19:54:10 -07:00 |
|
Paul Scovanner
|
cb6234b6df
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 36c17b8465
am: 1e15d33232
Change-Id: Ic80af5f8665685d74fd50ef5de31aa6607aed4f0
|
2019-08-14 19:53:58 -07:00 |
|
Paul Scovanner
|
61dfcf7964
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 5140669795
am: 0cafcd40dc
Change-Id: Ib492f372e055aac8757bb3a3ebb6ea9c65890e91
|
2019-08-14 19:46:32 -07:00 |
|
Android Build Merger (Role)
|
bbe3ffa293
|
Merge "Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2" into qt-r1-dev-plus-aosp am: 2021b3bc8e" into qt-qpr1-dev-plus-aosp
|
2019-08-15 02:45:53 +00:00 |
|
Paul Scovanner
|
dc467fbe14
|
Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2" into qt-r1-dev-plus-aosp
am: 2021b3bc8e
Change-Id: Idb70efa950f59e1b180b62a5e8aee03ea618dc6d
|
2019-08-14 19:45:42 -07:00 |
|
Paul Scovanner
|
268197b376
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540 am: 5140669795
am: d77b00d4d0
Change-Id: I7586037ca8c1f95870e285ab54ce2fdb4c4fcdf6
|
2019-08-14 19:45:41 -07:00 |
|
Android Build Merger (Role)
|
30114759cb
|
Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2 am: 50fa3d0d19" into qt-qpr1-dev-plus-aosp
|
2019-08-15 02:45:00 +00:00 |
|
Paul Scovanner
|
961a8e61d4
|
Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2
am: 50fa3d0d19
Change-Id: I8acb4cff9b8f1f802b0bd124572fa13e09e3e640
|
2019-08-14 19:44:48 -07:00 |
|
Paul Scovanner
|
d9cdf3078b
|
Update Security Strings to 2019-10-05 am: 84633edb22 am: b6ef08709f
am: 28a43e18c7
Change-Id: Ia8c885e3cbf88a79c4a54cceb899bd67af848d30
|
2019-08-14 19:44:46 -07:00 |
|
Hsin-Yi Chen
|
a489b755a0
|
Merge "Add tags to lsdump_paths.txt"
am: 7205361315
Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
|
2019-08-14 19:44:40 -07:00 |
|
Paul Scovanner
|
1e15d33232
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 36c17b8465
Change-Id: I1672ee8dc5afb8e2b42df7c7e01cda4947722825
|
2019-08-14 19:44:28 -07:00 |
|
Paul Scovanner
|
0cafcd40dc
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 5140669795
Change-Id: I14b56815c9078b256690abdff9492a540e4a8659
|
2019-08-14 19:36:12 -07:00 |
|
Paul Scovanner
|
d77b00d4d0
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 5140669795
Change-Id: Ic177165f28fa6bf7f1f1b3773c95959204dfef8f
|
2019-08-14 19:35:54 -07:00 |
|
Android Build Merger (Role)
|
2021b3bc8e
|
Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2" into qt-r1-dev-plus-aosp
|
2019-08-15 02:35:34 +00:00 |
|
Paul Scovanner
|
1a3c30ba72
|
Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2
Change-Id: I36210d628e0aec87c620894f241dd346b3c782c7
|
2019-08-14 19:35:22 -07:00 |
|
Paul Scovanner
|
28a43e18c7
|
Update Security Strings to 2019-10-05 am: 84633edb22
am: b6ef08709f
Change-Id: I4cf849301ae9106bdfff1844e28285d726bdd648
|
2019-08-14 19:35:18 -07:00 |
|
Paul Scovanner
|
50fa3d0d19
|
Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2
Change-Id: I87545a0d1ffdb20306641799a7def47b4b602508
|
2019-08-14 19:35:17 -07:00 |
|
Paul Scovanner
|
36c17b8465
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours
am: 616d794540
Change-Id: I9582fb7b7b6160208d8e8bc26843dd4cdd3316cb
|
2019-08-14 19:34:55 -07:00 |
|
Paul Scovanner
|
5140669795
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours
am: 616d794540
Change-Id: I6464a4f9286fd3fafe1c5f5ca3f0766913dc98c2
|
2019-08-14 19:26:50 -07:00 |
|
Paul Scovanner
|
e1d53f95a2
|
Update Security Strings to 2019-10-05
am: 84633edb22
Change-Id: I360a2512006317b0999586a5567b0bf370ee120b
|
2019-08-14 19:26:11 -07:00 |
|
Paul Scovanner
|
b6ef08709f
|
Update Security Strings to 2019-10-05
am: 84633edb22
Change-Id: Id72288336ca859f6f0bde987876d017f0d36b906
|
2019-08-14 19:25:16 -07:00 |
|
Paul Scovanner
|
616d794540
|
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01
am: b88c9853aa -s ours
am skip reason: subject contains skip directive
Change-Id: I9454feb6965bf8a9e56342a3f8348d5933ece914
|
2019-08-14 19:24:52 -07:00 |
|
Hsin-Yi Chen
|
7205361315
|
Merge "Add tags to lsdump_paths.txt"
|
2019-08-15 02:20:30 +00:00 |
|
Bill Peckham
|
ec60885055
|
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a am: 861ffd1588 am: bdddae3195 am: 2f880db3b6
am: d6e81a6795
Change-Id: I74d24aed4bf8a155a1550aad4a22008d4ed0688a
|
2019-08-14 16:48:12 -07:00 |
|
Tao Bao
|
77033f6b4d
|
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master am: 0a712a0834 am: 5b554c9814 am: 8ae2b470d1
am: cc633571a5
Change-Id: Ie5d8b9750bc57807b6a941c8c7dac8b8237f8e1f
|
2019-08-14 16:30:13 -07:00 |
|
Bill Peckham
|
d6e81a6795
|
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a am: 861ffd1588 am: bdddae3195
am: 2f880db3b6
Change-Id: I66da45261161539db6743179ee7b803e71741cef
|
2019-08-14 16:30:11 -07:00 |
|
Bill Peckham
|
2f880db3b6
|
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a am: 861ffd1588
am: bdddae3195
Change-Id: Ibaca9bd017750cf2831245b62b375ae66c1d1aa0
|
2019-08-14 16:21:06 -07:00 |
|
Bill Peckham
|
bdddae3195
|
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a
am: 861ffd1588
Change-Id: Ia0fbf2ffc7425c2cfede6bd4ae6a2ed1c1c6ed25
|
2019-08-14 16:13:03 -07:00 |
|
Bill Peckham
|
861ffd1588
|
Merge "Avoid adding VINTF manifest fragment more than once."
am: fd25038f8a
Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
|
2019-08-14 16:04:02 -07:00 |
|
Bill Peckham
|
fd25038f8a
|
Merge "Avoid adding VINTF manifest fragment more than once."
|
2019-08-14 22:44:30 +00:00 |
|
Tao Bao
|
cc633571a5
|
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master am: 0a712a0834 am: 5b554c9814
am: 8ae2b470d1
Change-Id: I08d25821abdabd8a4a8e898d16ce5dd6915f3337
|
2019-08-14 15:37:56 -07:00 |
|
Tao Bao
|
8ae2b470d1
|
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master am: 0a712a0834
am: 5b554c9814
Change-Id: Ib968f4a9528c5aad76372dac1fffbd4a814e34da
|
2019-08-14 15:27:53 -07:00 |
|
Tao Bao
|
5b554c9814
|
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master
am: 0a712a0834
Change-Id: Ibb92b56d4cf339f8fbff2dade7aad0f7fc0dbd63
|
2019-08-14 15:18:52 -07:00 |
|
Paul Scovanner
|
b88c9853aa
|
[DO NOT MERGE] Update Security Strings to 2019-09-01
Bug:139434268
Change-Id: I802a7aeb0c65240ff71f91506b8932bfa44090bc
|
2019-08-14 22:17:07 +00:00 |
|
Xin Li
|
1780f0887c
|
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 5e0e14531d -s ours am: 40068de16a am: 7207289400
am: 2cd6f4d0a5 -s ours
am skip reason: subject contains skip directive
Change-Id: I1df49efad134f76144fce8dfb5e9ec5aba79eaf5
|
2019-08-14 14:52:29 -07:00 |
|
Tao Bao
|
0a712a0834
|
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master
|
2019-08-14 21:46:17 +00:00 |
|
Paul Scovanner
|
84633edb22
|
Update Security Strings to 2019-10-05
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
|
2019-08-14 21:11:01 +00:00 |
|
Xin Li
|
2cd6f4d0a5
|
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 5e0e14531d -s ours am: 40068de16a
am: 7207289400
Change-Id: I85316c1d90187b0a35159f7bab9545ad67d0e28d
|
2019-08-14 14:07:53 -07:00 |
|
Xin Li
|
7207289400
|
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 5e0e14531d -s ours
am: 40068de16a
Change-Id: Id7c45531038611229c4e7e5a4be6131e78e90f3b
|
2019-08-14 13:43:00 -07:00 |
|
Xin Li
|
40068de16a
|
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 5e0e14531d -s ours
am skip reason: subject contains skip directive
Change-Id: Idc30810f1b921b7f02d4ad725d3168844009cdeb
|
2019-08-14 13:17:55 -07:00 |
|
Tomasz Wasilczyk
|
3c43f8ff56
|
Merge "Add CAN bus HAL to VNDK."
|
2019-08-14 20:13:25 +00:00 |
|