tree 952a84d24ac14b59c3beb073d798d688f7a5339d
parent 969570804cdf7636bd405de9142c2d487e71384c
parent c0ce002ae53613f622c3bb2cae258a779e22770c
author Rom Lemarchand <romlem@google.com> 1379103654 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379103654 -0700

am c0ce002a: Merge "Initial libmemtrack" into klp-dev

* commit 'c0ce002ae53613f622c3bb2cae258a779e22770c':
  Initial libmemtrack