aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-08Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Elliott Hughes
2021-12-08Merge "Upgrade jsoncpp to 1.9.5"Elliott Hughes
2021-12-07Upgrade jsoncpp to 1.9.5Elliott Hughes
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 Change-I...Maria Uretsky
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 Change-I...Maria Uretsky
2021-10-04Update cpe for vulnerability scannersMaria Uretsky
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"...android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Haibo Huang
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"...Haibo Huang
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"...android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Haibo Huang
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""android-s-beta-2android-s-beta-1Haibo Huang
2021-03-12Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"Haibo Huang
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade e...Treehugger Robot
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade e...Treehugger Robot
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade e...Treehugger Robot
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade e...Treehugger Robot
2021-03-11Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""Patrick Rohr
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ...Haibo Huang
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ...Haibo Huang
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ...Haibo Huang
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""Haibo Huang
2021-03-03Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"Haibo Huang
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13 am: ...Haibo Huang
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0b am: ...Haibo Huang
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13Haibo Huang
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0bHaibo Huang
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661Haibo Huang
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5aHaibo Huang
2021-03-01Merge changes from topic "jsoncpp_upgrade"Haibo Huang
2021-03-01[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easierHaibo Huang
2021-03-01[jsoncpp] Disable locale supportHaibo Huang
2021-03-01Upgrade jsoncpp to 1.9.4Haibo Huang
2021-03-01Merge "Add janitors and jophba@ to OWNERS"Haibo Huang
2021-03-01Add janitors and jophba@ to OWNERSHaibo Huang
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2518b1d923 -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2518b1d923 -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ...Bob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ...Bob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5Bob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncppBob Badour
2020-11-24Mark ab/6881855 as merged am: 2e9e481ad2 am: 7b493675c6Xin Li
2020-11-24Mark ab/6881855 as merged am: 2e9e481ad2Xin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d a...Treehugger Robot
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d a...Treehugger Robot
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d a...Treehugger Robot
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773dTreehugger Robot
2020-11-12Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-11Add "product_available" to product available modulesJustin Yun