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