tree b7b863dff72cc0b8a32fb085ed0c93023366c9f9
parent a79501cd3843149f0759bd53d310cf97d4ee1c8d
parent 1632fae376eb460cf992e543b13c8690b71fe8d5
author Marco Nelissen <marcone@google.com> 1395952514 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395952514 +0000

Merge "Make setServer() safe to call multiple times"