fixed bugs for GCM on android