tree 715db2a79b6064db69f804fe8049c86cbad1ca0a
parent 4e341c27fdcad6b78fea3bcd9886c92f1f9604d1
parent c71a4af2527058840ed9d1ea5ba963f36e510c2a
author Yabin Cui <yabinc@google.com> 1501030838 +0000
committer android-build-merger <android-build-merger@google.com> 1501030838 +0000

Merge "simpleperf: move inferno to scripts directory." am: 0cffcbee0d
am: c71a4af252

Change-Id: I0c0e5cd874fa6a7185717a794807d95b2ebb478f