| commit | 7d97fd4e42fc3cf2691cdea5c314d8cac1ce839c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 27 22:14:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 22:14:11 2014 +0000 |
| tree | 34ad6cf840bca728ab8621bd339a39e120539966 | |
| parent | 5d342522a087239b7079ad82959cfcae56024b9c [diff] | |
| parent | f0d019c4e4ef5ec9b03330c8441aa1356036cc60 [diff] |
am f0d019c4: Merge "Make setServer() safe to call multiple times" * commit 'f0d019c4e4ef5ec9b03330c8441aa1356036cc60': Make setServer() safe to call multiple times