tree 0128397557e2abaa64acbfaf63ce5b1f9a0089d6
parent f0def71e239fd7cbc91883a407381bdd75162552
parent 6d4da08bffab4fafab81b73d7ef20b9ffae51bfe
author Colin Cross <ccross@android.com> 1449847638 -0800
committer android-build-merger <android-build-merger@google.com> 1449847638 -0800

Merge "Fix allocation count" am: b25116f735
am: 4b5d182fd5

* commit '4b5d182fd5055a4052237785164f543fe49b8f1d':
  Fix allocation count