aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-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-03Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"Haibo 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-20Mark ab/7061308 as merged in stage.Xin Li
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: 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: 007228773dTreehugger Robot
2020-11-12Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-11Add "product_available" to product available modulesJustin Yun
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25 am: c4fa527a60 am: 7...Yifan Hong
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25 am: c4fa527a60Yifan Hong
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25Yifan Hong
2020-11-02Merge "Make {vendor_,}ramdisk_available."Yifan Hong
2020-10-21Make {vendor_,}ramdisk_available.Yifan Hong
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927 am:...Treehugger Robot
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927 am:...Treehugger Robot
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927Treehugger Robot
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edfandroid-r-beta-3android-r-beta-2Treehugger Robot
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE"Treehugger Robot
2020-04-28Add METADATA to jsoncpp: MIT=NOTICEBob Badour
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27Set min_sdk_version to be part of mainline modules am: 3c3f271211 am: 85efb03...Jooyung Han
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27Set min_sdk_version to be part of mainline modules am: 3c3f271211 am: 85efb03d15android-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-releaseJooyung Han
2020-04-27Set min_sdk_version to be part of mainline modules am: 3c3f271211android-11.0.0_r16android11-d1-b-releaseJooyung Han
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3...Jooyung Han
2020-04-27Set min_sdk_version to be part of mainline modulesandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devJooyung Han
2020-04-22Merge "Set min_sdk_version to be part of mainline modules" am: f84775a59e am:...Treehugger Robot