tree 1a5fdf4d87c741041786700c7c6556488b6241cf
parent 55cf3bb9412ba5761b4a71b8aab588f7436e769b
parent 0a640a4f02cf463290332dc2aaf13282fd525165
author Jason Sams <jsams@google.com> 1429064838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429064838 +0000

am 0a640a4f: am e0a834ba: am 428ac0f9: Merge "Fix object logging"

* commit '0a640a4f02cf463290332dc2aaf13282fd525165':
  Fix object logging