tree 57bb975c5fe8aab6b2ac84e522c551a1b32ffc1f
parent 94e8bf2da095007fa2fb3e8398b61f0db7b5c9ea
parent 67ad31b21f88ded13695c9282f07ac6907fd7168
author Mark Salyzyn <salyzyn@google.com> 1502377668 +0000
committer android-build-merger <android-build-merger@google.com> 1502377668 +0000

Merge "bootstat: switch from root.root to system.log" am: de6b44aa0e
am: 67ad31b21f

Change-Id: I609a77a3eb6d61e60bea63d8e87eab1ab042eaf9