am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex...
am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
* commit '18e99d1d':
Add new resources trace, also trace apk dex loading.