tree 774f2dcf7d53624b641581981d87e6a068a74be2
parent b483aebdd39c4fe23d68e7f54cd5d51ecff7a755
parent 82f91da700445c4606faea45ac8f0dc9f2857471
author Mathieu Chartier <mathieuc@google.com> 1436906852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436906852 +0000

am 82f91da7: am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"

* commit '82f91da700445c4606faea45ac8f0dc9f2857471':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses