tree 4763f7e59b352d7958db2900fd15921acdc902f9
parent db40a75199ddfcd367c5b52da0fe714b48efa7b5
parent 917b4d4392eff592c5381a481511a2b5bf703ced
author Nandana Dutt <nandana@google.com> 1550480849 -0800
committer android-build-merger <android-build-merger@google.com> 1550480849 -0800

Merge "Fix dumpstate smoke test"
am: 917b4d4392

Change-Id: Idaaf794a1a5bc487cee938c11ee913c147f0ac1a