tree eb771c75ef57de7be536e82b904047b38c7f70bd
parent 53df8fac8bb234861a54e949ebd4b3e97124c0d2
parent 9a130151a29e5d61dfedea0bb32d7f2bb0bda0f5
author Steven Moreland <smoreland@google.com> 1495753700 +0000
committer android-build-merger <android-build-merger@google.com> 1495753700 +0000

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

Change-Id: I8045623cc47804816df7304cabea1633a18aeada