tree 79f84ffa1838ee986b886a3edb027206b0a9f516
parent f8179d389c184583b62bf1298e251e13f0afa809
parent 92ec0c5e8dd11bfe895f1bf7409d47097081aa50
author Roland Levillain <rpl@google.com> 1454609052 +0000
committer android-build-merger <android-build-merger@google.com> 1454609052 +0000

Merge "Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC." am: 496450a9f4
am: 92ec0c5e8d

* commit '92ec0c5e8dd11bfe895f1bf7409d47097081aa50':
  Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC.