tree 5e69ae018417e43f902a592b28209e3136e473c6
parent 6c970477ac82100c85fcada220d4742dd1cbc3c6
parent d44f72ddb58110791016a37a10c264fa1a0ad60b
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525384845 -0700
committer android-build-merger <android-build-merger@google.com> 1525384845 -0700

Merge "bootstat: add reboot,rescueparty" am: 708364e650
am: d44f72ddb5

Change-Id: I3c9aab04ee860b467e7a10d3c83c2ddd021ddecd