recommitting android frontend

please don't break