tree 07adc4237a824cf1015c8d31e6886e4900680147
parent f4c1cab6a4fd4bf8a8c634e725f19bf514ea2937
parent 7b50acb4bd899fbbe31cd049d9f3a24d07b5213d
author Yabin Cui <yabinc@google.com> 1510006097 +0000
committer android-build-merger <android-build-merger@google.com> 1510006097 +0000

Merge "simpleperf: fix callchains generated by the kernel." am: d1dd064d3e
am: 7b50acb4bd

Change-Id: I1899d0734d8fc28c1f7d8ade81d27e2554e8c9ce