tree 693fb71a5084cc56bc5c83ff4336bc562c25c841
parent 61707d3c31db14a2b8c446e4ca48f003be248157
parent a160af256f307657aa7e5aefabc2fa2fdd33dc14
author Yabin Cui <yabinc@google.com> 1509384526 +0000
committer android-build-merger <android-build-merger@google.com> 1509384526 +0000

Merge "simpleperf: update demo." am: 0f0bc1d7ea
am: a160af256f

Change-Id: I30df97fa383698ee4feec14401f5d6527eec376a