tree 76678e72a22ccbdfc6392cfa26607dcbe0716b07
parent 83048a4a15549b2a3229768aeea19be30221c4cb
parent a6fdd681aee2893d362d6ce3fe817485f3449646
author Primiano Tucci <primiano@google.com> 1523365277 -0700
committer android-build-merger <android-build-merger@google.com> 1523365277 -0700

Merge "Deflake ServiceImplTest.BatchFlushes"
am: a6fdd681ae

Change-Id: I81b15590879a9eff232f14df013b826a892bb99f