am 1f4c536f: (-s ours) Merge "Hide ScopedTrace."

* commit '1f4c536fd53c69ba8122528435251b894e877e2a':
  Hide ScopedTrace.
This commit is contained in:
Dan Albert 2014-08-13 20:16:54 +00:00 committed by Android Git Automerger
commit 9b4410b912

Diff Content Not Available