tree 062dcf43161513907b8b8931e7de33c19f9a8f4f
parent 0e2f22a42bc91db814591164b8a2cfc3d5a5cdbc
parent 75dcb3338d85d12991249598e1ed407c8a6be1eb
author Ian Rogers <irogers@google.com> 1361984000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361984000 +0000

am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting."

* commit '75dcb3338d85d12991249598e1ed407c8a6be1eb':
  Deprecate and document memory allocation counting.