OSDN Git Service

Merge changes I67dbf04a,I032f6741
authorTreehugger Robot <treehugger-gerrit@google.com>
Mon, 26 Feb 2018 21:36:15 +0000 (21:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 26 Feb 2018 21:36:15 +0000 (21:36 +0000)
commit727ec42d8d0a98c774bebabbab870c308fc2c17e
treea52f738ecc46c1d7872339919b16bd9a84ef284a
parent8378efc6af0d5fee9ad5094d3a0eb4a4f938b76f
parent8f4716c401464ed21b1d9c1e2d519ef0a84d9c60
Merge changes I67dbf04a,I032f6741

* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test