tree 005e320c4ee96cec30ec20c810a28a2cf205fe26
parent 05f980d42d4926ab2130cdcf9e646eb610a7080b
parent a6f5e79dd182b05909fa53109e74638afcd7ee12
author Narayan Kamath <narayan@google.com> 1397052916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397052916 +0000

am a6f5e79d: Merge "Allow connections to multiple zygotes."

* commit 'a6f5e79dd182b05909fa53109e74638afcd7ee12':
  Allow connections to multiple zygotes.