tree 9e89b971581580863c572f3a64ace1ed890474da
parent aecb9b59e6c9e9a864bf4b302f978fb950df09ff
parent aa9972943cab627db9b10e5c9c4bb80f99f8a4bd
author Chris Craik <ccraik@google.com> 1336553284 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553284 -0700

am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev

* commit 'aa9972943cab627db9b10e5c9c4bb80f99f8a4bd':
  Revert "Add temporary functor lifetime logging"