tree 827a72735095f5c63da91652c6468a08eaf087c6
parent a14d6fda714e6d1c1578325eaec991032ce0558f
parent c08b50dfc68504b692c13194e86d33328d373019
author Dianne Hackborn <hackbod@google.com> 1365811386 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365811386 -0700

am c08b50df: am 24bc41b7: Add new resources trace.

* commit 'c08b50dfc68504b692c13194e86d33328d373019':
  Add new resources trace.