| commit | 5c47f00ea3d2e3a01835ec2f2bfabd3217e0ee42 | [log] [tgz] |
|---|---|---|
| author | Haibo Huang <hhb@google.com> | Thu Mar 11 07:50:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 11 07:50:36 2021 +0000 |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 5da34eb81722ed5688f6723bc2dd5adc0f54f2ee [diff] | |
| parent | 9725ff3bd286ed73ef2e9b95fdc5e905a07c8262 [diff] |
Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 9b1642bccd am: 9725ff3bd2 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9aad0ab5df185f8f1dcf7257f6a67fd734d558cc