tree 5542344a76634ae30bd49784d136ab801508d47e
parent a1ea48c78126c38e5b584d13371538fd969b032c
parent 860f2e29aa3fc99f0af6c523db4fc8fc61fa7dff
author Suren Baghdasaryan <surenb@google.com> 1549343301 -0800
committer android-build-merger <android-build-merger@google.com> 1549343301 -0800

[automerger skipped] Merge "make libjsoncpp available for init and in VNDK" am: 8811b79061 am: 8eff3631a8
am: 860f2e29aa -s ours
am skip reason: change_id I8cd589f02fd7beef351f5962e1a257418e253f6c with SHA1 a1ea48c781 is in history

Change-Id: Ia2b464968258975aba740649e68430b72d80a579