summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 96ee4e2ac6 -s ours am: 10f5891386 am: 774c29f667 Change-Id: I05193a8b200020addfbffae1c39b580bdb7edde9
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 96ee4e2ac6 -s ours am: 10f5891386 Change-Id: Ibaabbd838325ab2b282c839ee4f6b0fbddcfbff0
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 96ee4e2ac6 Change-Id: I1aa4565a6cb7b4d7ad729df9902cc628bc7be80c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 96ee4e2ac6 -s ours am skip reason: subject contains skip directive Change-Id: I64345e9c16a57424495ac8ce8e3ecfab365fa0f0
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I5a36f713bc8cb8787910c7d8d8590588753ebcc4
2020-03-13Merge "Revert "Duplicate ip_mp_alg.h to include/"" into rvc-dev-plus-aosp ↵Automerger Merge Worker
am: b2d7883f92 am: 1ca5a6edd5 am: 69d92abdb1 Change-Id: I7755094bf1c4e3a8d92d5e9bb6efe58aec1f80c1
2020-03-13Merge "Revert "Duplicate ip_mp_alg.h to include/"" into rvc-dev-plus-aosp ↵Automerger Merge Worker
am: b2d7883f92 am: 1ca5a6edd5 Change-Id: If9d02019abf1e718bf5f87843ff988e1baaa8988
2020-03-13Merge "Revert "Duplicate ip_mp_alg.h to include/"" into rvc-dev-plus-aosp ↵Automerger Merge Worker
am: b2d7883f92 Change-Id: I3f4a9c6b634da0d6d67b4ae6feaa97e8f3341258
2020-03-13Merge "Revert "Duplicate ip_mp_alg.h to include/"" into qt-qpr1-dev-plus-aospHaibo Huang
2020-03-13Merge "Revert "Duplicate ip_mp_alg.h to include/"" into rvc-dev-plus-aospHaibo Huang
2020-03-13Revert "Duplicate ip_mp_alg.h to include/"Haibo Huang
This reverts commit 838e33b18a09e15ef4e3bf4fe715ae5a274714d8. Reason for revert: libnl is upgraded. this is not necessary Change-Id: Ie484a90d669c49c329dbc7ee42cacbc1dfa09719
2020-03-13Revert "Duplicate ip_mp_alg.h to include/"Haibo Huang
This reverts commit e50e0b1729db643b651b783cfa49288b2513cd3d. Reason for revert: libnl is upgraded. this is not necessary. Change-Id: Id84532f44806291317902beb7bab10b9db6b6b49
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9e am: fe04e6d516 am: ↵Automerger Merge Worker
fbe275693e am: cc1d67c9a4 am: 087352dd49 Change-Id: I8a0eae27aa27facb00b6e5c1956fd982bd381d5a
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1b am: 414a511590 am: ↵Automerger Merge Worker
28a75b9caf am: c7417a29ca am: 2e657c7b5c Change-Id: If45e15d582ef251cf429d219fd80b5d82e03e74f
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca am: 12d512d9f2 am: 067e13b78c am: 3202d7772d am: 2159f742d3 Change-Id: Iab8dfc37d307314276415f019266480177eecf5c
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9e am: fe04e6d516 am: ↵Automerger Merge Worker
fbe275693e am: cc1d67c9a4 Change-Id: I761d2334cbc5416838c7ecf6583a851257ab903d
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1b am: 414a511590 am: ↵Automerger Merge Worker
28a75b9caf am: c7417a29ca Change-Id: I6f1d48150dbf4d9494e3940b31182e697a4c09b2
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca am: 12d512d9f2 am: 067e13b78c am: 3202d7772d Change-Id: Id7310e8ae276c6759a7656a0da18c5bbf7395d5e
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9e am: fe04e6d516 am: fbe275693eAutomerger Merge Worker
Change-Id: Ieffc8c397c2f4e94c3edc914a4fa349df5851f47
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1b am: 414a511590 am: 28a75b9cafAutomerger Merge Worker
Change-Id: I10c21eb262fe1e149ad9ff4d458abcd75778480d
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca am: 12d512d9f2 am: 067e13b78c Change-Id: I6c7e07b0e2669fc68c8723de4cae5317420edbed
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9e am: fe04e6d516Automerger Merge Worker
Change-Id: Id85776ea191c0d5e3519f504a8b9879e8b13de1e
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1b am: 414a511590Automerger Merge Worker
Change-Id: I9f41685c89c464fc187c2d7581d7ead690f91894
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca am: 12d512d9f2 Change-Id: I649b8b9c76af4eab0bf1d0f671c12b10cf4a9d43
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9e am: fe04e6d516Automerger Merge Worker
Change-Id: I8e67af21dc5116e32a7c0ce455cc84cd90686dd6
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1b am: 414a511590Automerger Merge Worker
Change-Id: Ib328b98caee41d541fc83f805af472fe49c6926d
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca am: 12d512d9f2 Change-Id: I1cba8cb4d72967b1f2ed0f6a36f47de7fa6f4816
2020-03-13Merge tag 'libnl3_5_0' into HEAD am: 232e42bb9eAutomerger Merge Worker
Change-Id: Iac7e32ac6d047ec1a0eb8f5fe17c6889a85c3189
2020-03-13Merge tag 'libnl3_2_25' into HEAD am: cea47bde1bAutomerger Merge Worker
Change-Id: I274ee144a319d6fb87157bc323498bd37baea323
2020-03-13Revert "[BACKPORT] build: move copy of linux headers to private directory" ↵Automerger Merge Worker
am: 0a450fbeca Change-Id: I75e62cb05161e59bfa6fb95a201c717b64939fb3
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdf ↵Automerger Merge Worker
am: eaf0ff4b41 am: 761e507b3b am: 0cd0868c67 Change-Id: If862d48bc4cd844945b6897faa27c2a51b846565
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: e0dd929ba7 ↵Automerger Merge Worker
am: 3e38b70706 am: 82fb4a40c4 Change-Id: I669c884b26d90a9329723eda45cb82d18a8ce34e
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdf ↵Automerger Merge Worker
am: 7b622df2f5 am: b820c6ba87 Change-Id: I4f33813b79e789ccea3beb04685e2e3c923f23ac
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdf ↵Automerger Merge Worker
am: eaf0ff4b41 am: 761e507b3b Change-Id: Id032a1d875d39e8094f30f1d47157fe0102f036f
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: e0dd929ba7 ↵Automerger Merge Worker
am: 3e38b70706 Change-Id: Icd777691ff1a0f911808eab384a3ecb915c458b9
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdf ↵Automerger Merge Worker
am: 7b622df2f5 Change-Id: Icdb540ff74e0088307da3b74da67b979f6f4544a
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdf ↵Automerger Merge Worker
am: eaf0ff4b41 Change-Id: I062db8933b50311a5e64ef8588262d8a5582eae3
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: e0dd929ba7Automerger Merge Worker
Change-Id: I1c4df2ae244e19f321e44a4ed84e41aa3cb31d88
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdfandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseAutomerger Merge Worker
Change-Id: I9bdd65e1ec1047dc1d7f6aa0717a4673ff31ab0f
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986a am: ad73771fdfAutomerger Merge Worker
Change-Id: Ia04172485465b3567b94a949f1ef5854972fcbc9
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986aAutomerger Merge Worker
Change-Id: I40b31d1fc479d1457c92549296b3c99939b65c90
2020-03-12attr: mark nested attributes as NLA_F_NESTED am: 8bdf14986aandroid-11.0.0_r16android11-d1-b-releaseAutomerger Merge Worker
Change-Id: I30e0ce85e0f61d9a92cbba2963cf50d055a7068a
2020-03-12Duplicate ip_mp_alg.h to include/ am: e50e0b1729 am: 604e0649fa am: 6b348ce5fdAutomerger Merge Worker
Change-Id: I8bee211695f00994a7cc0e3e01bce35f9c20670c
2020-03-12Duplicate ip_mp_alg.h to include/ am: e50e0b1729 am: 604e0649faAutomerger Merge Worker
Change-Id: Id6554491ac82e1cfb573a965ebd122b620d9db7b
2020-03-12Duplicate ip_mp_alg.h to include/ am: e50e0b1729Automerger Merge Worker
Change-Id: I7a4165e08f56ce9a7854432037ededbeadbc7a2a
2020-03-12Duplicate ip_mp_alg.h to include/Haibo Huang
This allows us to remove linux-private from include paths. The new libnl doesn't depend on it so we can remove it after upgrade. Bug: https://issuetracker.google.com/150744338 Change-Id: I6631b76ca7b41fe25b04d6e692c637abedd89c3a
2020-03-12Duplicate ip_mp_alg.h to include/Haibo Huang
This allows us to remove linux-private from include paths. The new libnl doesn't depend on it so we can remove it after upgrade. Bug: https://issuetracker.google.com/150744338 Change-Id: I6631b76ca7b41fe25b04d6e692c637abedd89c3a
2020-03-10Merge tag 'libnl3_5_0' into HEADHaibo Huang
3.5.0 release Bug: 150744338 Change-Id: Ib8e350897499ec1acc90b6ed15f6bc3c4efbc906
2020-03-10Merge tag 'libnl3_2_25' into HEADHaibo Huang
3.2.25 release This change reverts all cherry picks to avoid further conflicts when merging new version. Change-Id: I58a98f4176f7a8cb3c410e3af6998fd90360dcd1
2020-03-10Revert "[BACKPORT] build: move copy of linux headers to private directory"Haibo Huang
This reverts commit aabc42835d3716d4a85f54691c9e3968d4227283. This change is upstreamed. Revert for easier upgrading. Change-Id: I4db9c660ab92cf71b1781ec6b9d86c3bd8fe3f73
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:55:13 +0000