tree fe16311057f2ead1319c34f5cb9a4dbb1eda1332
parent 46a410912bd7eaf3743ada62c7cf40741a9b3020
parent bff2096bc5b55bf3ffd525ab40acf4fff2b280fa
author Nandana Dutt <nandana@google.com> 1548265747 -0800
committer android-build-merger <android-build-merger@google.com> 1548265747 -0800

Merge "Dumpstate aidl: add cancelBugreport" am: 75c59f8bd0 am: adcb727618
am: bff2096bc5

Change-Id: Ic935e9395b82ceab9509b17682910f02b0dc439d