tree fe0099ab5e05d9e1fc8bec425e1dbcbd4c7014a8
parent bb5b7a264969a961291e0cce9b16678f78151b48
parent 31a7345c9c9398c18d6fb6fa4118bd2bfdb437e2
author Nick Kralevich <nnk@google.com> 1363303003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363303003 -0700

am 31a7345c: am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"

* commit '31a7345c9c9398c18d6fb6fa4118bd2bfdb437e2':
  Respawn app_main if ADDR_COMPAT_LAYOUT is not set