From: Igor Murashkin <iam@google.com>
Date: Thu, 3 Dec 2015 19:33:03 +0000 (+0000)
Subject: Merge "imgdiag: Fix rarely flaky imgdiag_test."
X-Git-Tag: android-x86-7.1-r1~976
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5840157f09fb7a64af524d82335b5322390d68c;p=android-x86%2Fart.git

Merge "imgdiag: Fix rarely flaky imgdiag_test."
am: ef45113d01

* commit 'ef45113d01c16102538a8848d6979e772dad6225':
  imgdiag: Fix rarely flaky imgdiag_test.
---

e5840157f09fb7a64af524d82335b5322390d68c