tree 489a4e68de6405fab5ce8dafdc84d626b126d861
parent 2054a4d6d4e2fdf4e4f6689a7f29eee5ec88cdf5
parent 20146916e2833a5cfa69bd94473a8df65e3f9446
author Treehugger Robot <treehugger-gerrit@google.com> 1519788853 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1519788853 +0000

Merge changes I06df032d,Ib923de28

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