tree 50c700e9f7dcc548f31e5e074b182d039828a7bc
parent b3e8d2f2b8b343ce77cfac909e505231ade6040c
parent e472f22bd4ececc38235f791093e50e8954dbcb0
author Ricky Wai <rickywai@google.com> 1457031088 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457031088 +0000

Merge "Don't assume that the primary user is user 0" into nyc-dev