Commit f8c9c568 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by android-build-merger
Browse files

[automerger skipped] Merge "make libjsoncpp available for init and in VNDK"... 

[automerger skipped] Merge "make libjsoncpp available for init and in VNDK" am: 8811b790 am: 8eff3631
am: 860f2e29 -s ours
am skip reason: change_id I8cd589f02fd7beef351f5962e1a257418e253f6c with SHA1 a1ea48c7 is in history

Change-Id: Ia2b464968258975aba740649e68430b72d80a579
parents a1ea48c7 860f2e29
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment