tree 099b324771d7fa60a5f985a7a94df2aff081e83d
parent 831f8cf941fa1d298652fdf95fccb7bc693b4fc4
parent c8e3a27b43407268b2bb76b1d4fceee4fa3b314a
author The Android Open Source Project <initial-contribution@android.com> 1352233419 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233419 -0800

am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.
  Dump 256 bytes per chunk pointed by general-purpose registers.
  Wrap system calls in TEMP_FAILURE_RETRY.
  Bring back ADB_EXTERNAL_STORAGE.
  Revert "Upgrade to dlmalloc 2.8.5."
  bluetooth: bring up with bluedroid stack
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.