OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE - Switch user picker/switcher to use CarUser...
authorYing Zheng <yizheng@google.com>
Mon, 21 May 2018 21:02:40 +0000 (14:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 21:02:40 +0000 (14:02 -0700)
am: ffcd82cad0  -s ours

Change-Id: I9148f59b3abb6fa246d4025700e06d4d1d1ac8ea


Trivial merge