tree 4aa28cbb7dc87fe0559ca57ae2d810a266fd4497
parent bf53be46d237866a9964a4f1fa960eb6ef4a70a6
parent 545464df282273209a837569f05e9990173f4d56
author Ian Rogers <irogers@google.com> 1361983856 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361983856 -0800

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

* commit '545464df282273209a837569f05e9990173f4d56':
  Deprecate and document memory allocation counting.