| commit | 11dc37686fa284f3c6c63b911febd4547d5bb92b | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Apr 12 17:06:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 12 17:06:37 2013 -0700 |
| tree | cb42202d9634253c530952204b4d1177b1fab2d7 | |
| parent | fd7e534b1f783c6bdd0e27196071d33fb14a7d57 [diff] | |
| parent | 18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93 [diff] |
am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev * commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93': Add new resources trace, also trace apk dex loading.