Daniel Nishi 3ac4d429f1 Merge "Fix a unit test regression." into oc-dev am: affc8fa18e ...

am: 60b40a31c8

Change-Id: Ib37112094988b3837b261fb7be28f4e3cecbe4f9

2017-04-05 20:11:18 +00:00

..

android

Update settings tests to use new constructor.

2017-03-24 15:50:04 -07:00

com/android

Merge "Fix a unit test regression." into oc-dev am: affc8fa18e

2017-04-05 20:11:18 +00:00