tree b025fa0ce4af8616e71b9bc1d2a7962f0c26a3b1
parent e4c6655532113ca12464f530ef1a410364adcb8d
parent 7f474a0dfefb45021303de4702f6a4409536cfa6
author Andreas Gampe <agampe@google.com> 1437503155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437503155 +0000

am 7f474a0d: am 411b96d6: Merge "ART: Remove some of the Mac craziness"

* commit '7f474a0dfefb45021303de4702f6a4409536cfa6':
  ART: Remove some of the Mac craziness