OSDN Git Service

Merge "Add user icon to the other user preferences." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Mon, 10 Apr 2017 17:32:27 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 17:32:27 +0000 (17:32 +0000)
am: b1c336de5f

Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b


Trivial merge