OSDN Git Service

Merge "imgdiag: Fix rarely flaky imgdiag_test." am: ef45113d01
authorIgor Murashkin <iam@google.com>
Thu, 3 Dec 2015 19:37:55 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Dec 2015 19:37:55 +0000 (19:37 +0000)
am: e5840157f0

* commit 'e5840157f09fb7a64af524d82335b5322390d68c':
  imgdiag: Fix rarely flaky imgdiag_test.


Trivial merge