tree 215740ca53edd447027fe31535a8289b254596e5
parent e97a42e05cced70dd5713c731a197187b4751800
parent 5e81a6e21e9977acd9dfafaf030bf51c8572a98f
author Arnaud Ferir <arnaud.ferir@trusted-logic.com> 1295894980 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295894980 -0800

am 5e81a6e2: Fix trace mismatch.

* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.