From: Roland Levillain <rpl@google.com>
Date: Mon, 7 Dec 2015 23:33:44 +0000 (+0000)
Subject: Merge "Fix the ART Buildbots using the master-art manifest." am: a2964d5ab5
X-Git-Tag: android-x86-7.1-r1~846^2^2~115
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=42061a6e4f;p=android-x86%2Fart.git

Merge "Fix the ART Buildbots using the master-art manifest." am: a2964d5ab5
am: 0be457fd49

* commit '0be457fd498a47d34a2ad00d53b72898f497afa4':
  Fix the ART Buildbots using the master-art manifest.
---

42061a6e4f1e6b9e7f1ef94281f45e888b32545a