| commit | 914b877f8bd5616de88e363b8f77d1b94125c712 | [log] [tgz] |
|---|---|---|
| author | Haibo Huang <hhb@google.com> | Fri Mar 12 22:07:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 22:07:32 2021 +0000 |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 87f427b6710b57e27238d79ac0945927ae5a1808 [diff] | |
| parent | b7b7b463ade9a824290d7dfd271b142ce9d7cb04 [diff] |
Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 6a7b9633e4 am: b7b7b463ad Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7ba34aeea056c65a8e5fb1e0d47e439dcb9eab2