Daniel Nishi 84aba27da4 Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f ...

am: f4af2774ee

Change-Id: I1ff26ce55a3b1ade531745e091e5c6e2de243593

2017-04-10 17:37:54 +00:00

..

android

Update settings tests to use new constructor.

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

com/android

Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f

2017-04-10 17:37:54 +00:00