Diff - 37403102d4e23fdd0cc3fa0d989d14fcf343a63e^1..37403102d4e23fdd0cc3fa0d989d14fcf343a63e - platform/external/linux-tools-perf

commit: 37403102d4e23fdd0cc3fa0d989d14fcf343a63e
[log]
author: Elliott Hughes <[email protected]>
Thu Aug 14 15:54:18 2014 +0000
committer: Android Git Automerger <[email protected]>
Thu Aug 14 15:54:18 2014 +0000
tree: fd160ceb662e7f57b8e00784d3288b87695c1667
parent: 71f5905a55024cecf92dfa3f804ffef764fef08e [diff]
parent: 58f171bd53002c6106cc69744bd728d15fef543f [diff]

am 58f171bd: Fix botched merge resolution for perf in lmp-dev-plus-aosp.

* commit '58f171bd53002c6106cc69744bd728d15fef543f':
  Fix botched merge resolution for perf in lmp-dev-plus-aosp.