Commits
Craig Mautner authored and Android Git Automerger committed cc1b52c7f0bM
am fc1d8f0a: Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev * commit 'fc1d8f0a96285c61264fe4ba079caccabcb6206d': Fix deadlock by keeping local copy of currentUserId
Showing diff tofc1d8f0a962