tree 988387f0d7b89d1145b9d06899edf013cf27bed2
parent a289a97d76a812232e5e02d37da6eef73543d7f8
parent 75374ba1d29314ef81993554e2d47324c2868105
author Mark Salyzyn <salyzyn@google.com> 1507664453 +0000
committer android-build-merger <android-build-merger@google.com> 1507664453 +0000

Merge "init+bootstat: reduce last reboot reason to canonical alias" am: 613a5a97e0 am: cfed5e795a
am: 75374ba1d2

Change-Id: I2de7cd7c894a7c26a59221aa20efc1f7226cebeb