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

* commit '9b4410b9123b32ecb3b48eb17ef67e029660a821':
  Hide ScopedTrace.
This commit is contained in:
Dan Albert
2014-08-13 20:21:59 +00:00
committed by Android Git Automerger

Diff Content Not Available