Completing Android client