tree a39bc599e78f83beddd0e70400ba7806c2d1739a
parent 7dbaba12dda072a06f2d82f1c6854b426eeb018d
parent 914b877f8bd5616de88e363b8f77d1b94125c712
author Haibo Huang <hhb@google.com> 1615589399 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615589399 +0000

Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 6a7b9633e4 am: b7b7b463ad am: 914b877f8b

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3298f926bbd3405ccdcafb953ed96c81b3aabf3a