tree 44936cd8ccd9e18b357da8f501bdf9fe2bfe6218
parent 7a0ca82bea11bf08fea28eb7dc068cd7eb171e28
parent 02f61fc27abdd95b6f738ec0ea896368b7d4e6a7
author Colin Cross <ccross@android.com> 1449782507 -0800
committer android-build-merger <android-build-merger@google.com> 1449782507 -0800

Merge "Fix allocation count"
am: b25116f735

* commit 'b25116f735e00467057085c18a984aca0cc93a84':
  Fix allocation count