tree 8e13b228959b93dce9c1b59eb486d421da0b4038
parent b2c35d1597aace199282148142249a3b14bd95f3
parent 625dde7bdf6726b967733bb8b506734824cd6b5a
author Chris Craik <ccraik@android.com> 1427919626 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427919626 +0000

am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"

* commit '625dde7bdf6726b967733bb8b506734824cd6b5a':
  Fix build - support new systrace file structure