tree c73ad870395d3ff8e93d246419359f969950fd76
parent c62f6970cbd646946f0b38932e16d30ef711a77f
parent 5337bbfbd1cd502bb2842698a6b2a543ab6a6c32
author Andreas Gampe <agampe@google.com> 1449086246 +0000
committer android-build-merger <android-build-merger@google.com> 1449086246 +0000

Merge "ART: Fix Mac build"
am: 5337bbfbd1

* commit '5337bbfbd1cd502bb2842698a6b2a543ab6a6c32':
  ART: Fix Mac build