| commit | 7dbaba12dda072a06f2d82f1c6854b426eeb018d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 11 14:08:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 11 14:08:42 2021 +0000 |
| tree | d44e03c4a271758289dae2caddce0d78bbc10dda | |
| parent | 0e8230737c3c3c70d9d558648d9fb8d5df4301b8 [diff] | |
| parent | 87f427b6710b57e27238d79ac0945927ae5a1808 [diff] |
Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d1858ea2403a104dad450f4c4c93b67faaf8a46