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