Commits
Marco Nelissen authored and Android Git Automerger committed 7d97fd4e42fM
am f0d019c4: Merge "Make setServer() safe to call multiple times" * commit 'f0d019c4e4ef5ec9b03330c8441aa1356036cc60': Make setServer() safe to call multiple times
Showing diff to5d342522a08