tree 0f9c8ee123df0692a1adcd7e077fb6ecd72a5ec6
parent 21546916e5d9d44de5d4ddfc4040cff9e759f8c2
parent a441e936f1498260ed7cd838cb987fc6a3fe8892
author Hsin-Yi Chen <hsinyichen@google.com> 1535956213 -0700
committer android-build-merger <android-build-merger@google.com> 1535956213 -0700

Merge "Add test for lsdump in JSON format"
am: a441e936f1

Change-Id: I8b83deec31ca2434babae0b66ccf50d03b948e7c