tree 3f9c7963157ce28899d1de082cf9405bf4c76419
parent 70bba904fc50f44cb4a695cf76e423534c835cf6
parent 4f4892d00aab13975a8aed000f84ae0320355fd7
author Narayan Kamath <narayan@google.com> 1397241180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397241180 +0000

am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."

* commit '4f4892d00aab13975a8aed000f84ae0320355fd7':
  Workaround 64 bit devices that don't have zygotes yet.