tree eaeeaa5a2a56fc6549548eaabd1068d370903e39
parent a4313feb23dd454905a3297bdc9ba745e6066a16
parent 6159ef4520073ae8e7ce7b7d1f7648b161a33302
author Carl Shapiro <cshapiro@google.com> 1296075820 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296075820 -0800

am 6159ef45: (-s ours) Parameterize instance counting to include subclasses.

* commit '6159ef4520073ae8e7ce7b7d1f7648b161a33302':
  Parameterize instance counting to include subclasses.