tree a97d40d0575acc7926bd28301a0a98162fbeff6a
parent 789f91db2cf02c5eaff26ad0ef61cf259bda25ba
parent b4b7fb72f4f394f10bb9e977dbb82062e4d79212
author Andreas Gampe <agampe@google.com> 1442264868 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442264868 +0000

am b4b7fb72: Merge "ART: Fix mac build"

* commit 'b4b7fb72f4f394f10bb9e977dbb82062e4d79212':
  ART: Fix mac build