tree cfdc5d962e515c228125be3ea7f57697fc53e220
parent 2d9d99f3984bf75d91905f4c747d2049b56c986a
parent 0d5300a12d02a8b17b7741644fa362180cc6af68
author James Hawkins <jhawkins@google.com> 1485920115 +0000
committer android-build-merger <android-build-merger@google.com> 1485920115 +0000

Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'." am: 31cf946d5b
am: 0d5300a12d

Change-Id: I4bd92d160270234dadc442f28042114d71fc2854