[aerogear-dev] Merging aerogear-android PR 37