OSDN Git Service

Merge changes I06df032d,Ib923de28
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 26 Feb 2018 21:51:01 +0000 (21:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 26 Feb 2018 21:51:01 +0000 (21:51 +0000)
* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests


Trivial merge