From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 5 Nov 2015 14:48:09 +0000 (+0000)
Subject: Merge "Fix flake around instrumentation." am: 55a77ef5f9
X-Git-Tag: android-x86-7.1-r1~846^2~61^2~90
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5bc5d8a234794ad129817ba3b0b85a66638929ba;p=android-x86%2Fart.git

Merge "Fix flake around instrumentation." am: 55a77ef5f9
am: 653e7d770a

* commit '653e7d770a1f8c5ef710276997babd09c483bb48':
  Fix flake around instrumentation.
---

5bc5d8a234794ad129817ba3b0b85a66638929ba