OSDN Git Service

Merge "Fix flake around instrumentation."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 5 Nov 2015 14:46:04 +0000 (14:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 14:46:04 +0000 (14:46 +0000)
commit653e7d770a1f8c5ef710276997babd09c483bb48
treec6695c51a1c27761f6bcaeb3fea3abf49cf93475
parent6ec2986ea8213a60ec341969e7eaf1b7dbaa0a58
parent55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270
Merge "Fix flake around instrumentation."
am: 55a77ef5f9

* commit '55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270':
  Fix flake around instrumentation.