[automerger skipped] Merge "Make the default user the current user (not 0)" into qt-qpr1-dev am: a7bdb8ba0b
am:2675ea8f8a-s ours am skip reason: change_id I0ee9313b1394515d9405344482dc1779d15c0819 with SHA1ed590eec31is in history Change-Id: I38277dc82a9ec49501950647eb0ede7756fb99f0
This commit is contained in: