OSDN Git Service

Merge changes I06df032d,Ib923de28
authorTreehugger Robot <treehugger-gerrit@google.com>
Wed, 28 Feb 2018 03:34:13 +0000 (03:34 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 28 Feb 2018 03:34:13 +0000 (03:34 +0000)
commit59a548b940c951bb6d95082e346a603257baadd3
tree489a4e68de6405fab5ce8dafdc84d626b126d861
parent2054a4d6d4e2fdf4e4f6689a7f29eee5ec88cdf5
parent20146916e2833a5cfa69bd94473a8df65e3f9446
Merge changes I06df032d,Ib923de28

* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests