tree e6fec479b8c078aad3ca7bee51a75e9122cae3a7
parent 33aacf1963dd1914c0ff94c4ddd05f729cdba3b6
parent 3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669
author Elliott Hughes <enh@google.com> 1416253216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416253216 +0000

am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."

* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.