tree 5015100cb583ba035d40917cc21d3846f42adc89
parent 1118e6e830f92105753cdcb6a9e395aa6c63ffa0
parent 90de0e337692839a24c8266166e527905ea1dedd
author Elliott Hughes <enh@google.com> 1638927734 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638927734 +0000

Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935 am: 90de0e3376

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

Change-Id: I75e106b330758a1c78a30f2ace282baf0b3928a7