tree ee3f058756dbb0a45b6ca9bb16449ae6ed242ec9
parent 8809f186eae7095772eee52dd9d4d736ea5fe76d
parent 822bbb382fa6b6c8d1b45770e27c2c2732a7afb7
author John Reck <jreck@google.com> 1397168761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397168761 +0000

am 822bbb38: Merge "Make attachFunctor blocking"

* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking