OSDN Git Service

Merge "Fix flake around instrumentation." am: 55a77ef5f9
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 5 Nov 2015 14:48:09 +0000 (14:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 14:48:09 +0000 (14:48 +0000)
am: 653e7d770a

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


Trivial merge