tree fff72e96c0fcb17a33fb870ec02dc5627ec3c070
parent f516a629824f0019315b9841dc2df76dc7862dde
parent 56aafd8c5dbfad107348a9521f5255ab21054893
author Chris Craik <ccraik@android.com> 1428072743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428072743 +0000

am 56aafd8c: Merge "Update to latest trace viewer"

* commit '56aafd8c5dbfad107348a9521f5255ab21054893':
  Update to latest trace viewer