tree c73ad870395d3ff8e93d246419359f969950fd76
parent 84bbe8b5a10fee84739dd020b62ac8b975ace5c0
parent 893b4c819321253f36bdca778aeb5d3ada871ae7
author Andreas Gampe <agampe@google.com> 1449086473 +0000
committer android-build-merger <android-build-merger@google.com> 1449086473 +0000

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

* commit '893b4c819321253f36bdca778aeb5d3ada871ae7':
  ART: Fix Mac build