tree 825f42adbb194a322d702d662a3a35bb44aaa4af
parent 951a77b6757f529a4ebc7bf678cce78abd5a8e3b
parent de314f2df25b8a158a7f2ff043e6c051c4f1fa4b
author Steven Moreland <smoreland@google.com> 1495754272 +0000
committer android-build-merger <android-build-merger@google.com> 1495754272 +0000

Merge "Add thread usage output to lshal." am: 4a3e0a9767 am: 9a130151a2
am: de314f2df2

Change-Id: I321f393d2fc7252ea6d009c743fe797b083d718a