OSDN Git Service

am bc07fb68: am 0bb5c17b: Merge "Make memtrack an optional module."
authorDan Albert <danalbert@google.com>
Fri, 21 Nov 2014 23:59:16 +0000 (23:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Nov 2014 23:59:16 +0000 (23:59 +0000)
* commit 'bc07fb6864db9eb206ef4fcbe2916aefd1fe6ff6':
  Make memtrack an optional module.


Trivial merge