{"push_id":640435589,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"155466471e65941fb6ea5c8de991cc0941bdb22c","before":"094e141292afd5d5cea3982182e734ad0e4d4745","commits":[{"sha":"c58929f3e8383d967f559161b0659a1dff8c4e97","author":{"email":"53a6c69dd9edcdab9150cda1975d75a5cbc14220@gmail.com","name":"Chris Pang"},"message":"Sync 04222015 - 2","distinct":true,"url":"https://api.github.com/repos/mncwireless/xox/commits/c58929f3e8383d967f559161b0659a1dff8c4e97"},{"sha":"dad172df0bcafed31b26ddbb2124188c42978f92","author":{"email":"53a6c69dd9edcdab9150cda1975d75a5cbc14220@gmail.com","name":"Chris Pang"},"message":"sync","distinct":true,"url":"https://api.github.com/repos/mncwireless/xox/commits/dad172df0bcafed31b26ddbb2124188c42978f92"},{"sha":"155466471e65941fb6ea5c8de991cc0941bdb22c","author":{"email":"53a6c69dd9edcdab9150cda1975d75a5cbc14220@gmail.com","name":"Chris Pang"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tResources/android/alloy/controllers/home.js\n\tResources/android/alloy/controllers/hopOn.js\n\tResources/android/alloy/controllers/hopOn1.js\n\tResources/android/alloy/controllers/hopOn2.js\n\tResources/android/alloy/controllers/hopOn3.js\n\tResources/android/alloy/controllers/hopOn4.js\n\tResources/android/alloy/controllers/hopOn5.js\n\tResources/android/alloy/controllers/hopOnStatus.js\n\tResources/android/alloy/controllers/hopOnSubmission.js\n\tResources/android/alloy/controllers/hopOnVerify.js\n\tResources/android/alloy/controllers/hopOnVerifySuccess.js\n\tResources/android/alloy/controllers/idd.js\n\tResources/android/alloy/controllers/iddSMS.js\n\tResources/android/alloy/controllers/iddVideo.js\n\tResources/android/alloy/controllers/iddVoice.js\n\tResources/android/alloy/controllers/internetManagement.js\n\tResources/android/alloy/controllers/internetManagement2.js\n\tResources/android/alloy/controllers/internetManagement3.js\n\tResources/android/alloy/controllers/internetManagement4.js\n\tResources/android/alloy/controllers/loyalty.js\n\tResources/android/alloy/controllers/loyalty2.js\n\tResources/android/alloy/controllers/loyalty3.js\n\tResources/android/alloy/controllers/menu.js\n\tResources/android/alloy/controllers/mobileData.js\n\tResources/android/alloy/controllers/mobileInternet.js\n\tResources/android/alloy/controllers/myAccount.js\n\tResources/android/alloy/controllers/notification.js\n\tResources/android/alloy/controllers/onlinePurchases.js\n\tResources/android/alloy/controllers/orderHistory.js\n\tResources/android/alloy/controllers/orderHistory2.js\n\tResources/android/alloy/controllers/panda.js\n\tResources/android/alloy/controllers/panda2.js\n\tResources/android/alloy/controllers/panda3.js\n\tResources/android/alloy/controllers/panda4.js\n\tResources/android/alloy/controllers/panda5.js\n\tResources/android/alloy/controllers/payment.js\n\tResources/android/alloy/controllers/payment2.js\n\tResources/android/alloy/controllers/payment3.js\n\tResources/android/alloy/controllers/payment4.js\n\tResources/android/alloy/controllers/payment5.js\n\tResources/android/alloy/controllers/payment6.js\n\tResources/android/alloy/controllers/penang.js\n\tResources/android/alloy/controllers/penang1.js\n\tResources/android/alloy/controllers/penang1758.js\n\tResources/android/alloy/controllers/penang1s1.js\n\tResources/android/alloy/controllers/penang2.js\n\tResources/android/alloy/controllers/penang3.js\n\tResources/android/alloy/controllers/postpaidStatement.js\n\tResources/android/alloy/controllers/prepaid.js\n\tResources/android/alloy/controllers/prepaidPack.js\n\tResources/android/alloy/controllers/prepaidPack2.js\n\tResources/android/alloy/controllers/prepaidPack3.js\n\tResources/android/alloy/controllers/prepaidPack4.js\n\tResources/android/alloy/controllers/prepaidPlus.js\n\tResources/android/alloy/controllers/prepaidStatement.js\n\tResources/android/alloy/controllers/products.js\n\tResources/android/alloy/controllers/profile.js\n\tResources/android/alloy/controllers/profileEdit.js\n\tResources/android/alloy/controllers/promo.js\n\tResources/android/alloy/controllers/promoDetail.js\n\tResources/android/alloy/controllers/register.js\n\tResources/android/alloy/controllers/report.js\n\tResources/android/alloy/controllers/roamingCalls.js\n\tResources/android/alloy/controllers/roamingSMS.js\n\tResources/android/alloy/controllers/seasonPass.js\n\tResources/android/alloy/controllers/seasonPass1.js\n\tResources/android/alloy/controllers/seasonPass2.js\n\tResources/android/alloy/controllers/seasonPass3.js\n\tResources/android/alloy/controllers/seasonPassCheckout1.js\n\tResources/android/alloy/controllers/seasonPassCheckout2.js\n\tResources/android/alloy/controllers/settings.js\n\tResources/android/alloy/controllers/subline.js\n\tResources/android/alloy/controllers/subline2.js\n\tResources/android/alloy/controllers/subline3.js\n\tResources/android/alloy/controllers/subline4.js\n\tResources/android/alloy/controllers/subline5.js\n\tResources/android/alloy/controllers/sublineDetails1.js\n\tResources/android/alloy/controllers/sublineDetails2.js\n\tResources/android/alloy/controllers/support.js\n\tResources/android/alloy/controllers/switchXOX.js\n\tResources/android/alloy/controllers/switchXOX2.js\n\tResources/android/alloy/controllers/switchXOX3.js\n\tResources/android/alloy/controllers/terms.js\n\tResources/android/alloy/controllers/userGuide.js\n\tResources/android/alloy/controllers/vas.js\n\tResources/android/api.js\n\tResources/android/common.js\n\tResources/android/pdf.js\n\tResources/iphone/alloy/controllers/accountDetails.js\n\tResources/iphone/alloy/controllers/home.js\n\tResources/iphone/alloy/controllers/idd.js\n\tResources/iphone/alloy/controllers/iddSMS.js\n\tResources/iphone/alloy/controllers/iddVideo.js\n\tResources/iphone/alloy/controllers/iddVoice.js\n\tResources/iphone/alloy/controllers/index.js\n\tResources/iphone/alloy/controllers/internetManagement.js\n\tResources/iphone/alloy/controllers/internetManagement2.js\n\tResources/iphone/alloy/controllers/internetManagement3.js\n\tResources/iphone/alloy/controllers/internetManagement4.js\n\tResources/iphone/alloy/controllers/loyalty.js\n\tResources/iphone/alloy/controllers/loyalty2.js\n\tResources/iphone/alloy/controllers/loyalty3.js\n\tResources/iphone/alloy/controllers/menu.js\n\tResources/iphone/alloy/controllers/mobileData.js\n\tResources/iphone/alloy/controllers/mobileInternet.js\n\tResources/iphone/alloy/controllers/myAccount.js\n\tResources/iphone/alloy/controllers/notification.js\n\tResources/iphone/alloy/controllers/onlinePurchases.js\n\tResources/iphone/alloy/controllers/orderHistory.js\n\tResources/iphone/alloy/controllers/orderHistory2.js\n\tResources/iphone/alloy/controllers/panda.js\n\tResources/iphone/alloy/controllers/panda2.js\n\tResources/iphone/alloy/controllers/panda3.js\n\tResources/iphone/alloy/controllers/panda4.js\n\tResources/iphone/alloy/controllers/panda5.js\n\tResources/iphone/alloy/controllers/payment.js\n\tResources/iphone/alloy/controllers/payment2.js\n\tResources/iphone/alloy/controllers/payment3.js\n\tResources/iphone/alloy/controllers/payment4.js\n\tResources/iphone/alloy/controllers/payment5.js\n\tResources/iphone/alloy/controllers/payment6.js\n\tResources/iphone/alloy/controllers/penang.js\n\tResources/iphone/alloy/controllers/penang1.js\n\tResources/iphone/alloy/controllers/penang1758.js\n\tResources/iphone/alloy/controllers/penang1s1.js\n\tResources/iphone/alloy/controllers/penang2.js\n\tResources/iphone/alloy/controllers/penang3.js\n\tResources/iphone/alloy/controllers/postpaidStatement.js\n\tResources/iphone/alloy/controllers/prepaid.js\n\tResources/iphone/alloy/controllers/prepaidPack.js\n\tResources/iphone/alloy/controllers/prepaidPack2.js\n\tResources/iphone/alloy/controllers/prepaidPack3.js\n\tResources/iphone/alloy/controllers/prepaidPack4.js\n\tResources/iphone/alloy/controllers/prepaidPlus.js\n\tResources/iphone/alloy/controllers/prepaidStatement.js\n\tResources/iphone/alloy/controllers/products.js\n\tResources/iphone/alloy/controllers/profile.js\n\tResources/iphone/alloy/controllers/profileEdit.js\n\tResources/iphone/alloy/controllers/promo.js\n\tResources/iphone/alloy/controllers/promoDetail.js\n\tResources/iphone/alloy/controllers/register.js\n\tResources/iphone/alloy/controllers/report.js\n\tResources/iphone/alloy/controllers/roamingCalls.js\n\tResources/iphone/alloy/controllers/roamingSMS.js\n\tResources/iphone/alloy/controllers/seasonPass.js\n\tResources/iphone/alloy/controllers/seasonPass1.js\n\tResources/iphone/alloy/controllers/seasonPass2.js\n\tResources/iphone/alloy/controllers/seasonPass3.js\n\tResources/iphone/alloy/controllers/seasonPassCheckout1.js\n\tResources/iphone/alloy/controllers/seasonPassCheckout2.js\n\tResources/iphone/alloy/controllers/setting_appVersion.js\n\tResources/iphone/alloy/controllers/settings.js\n\tResources/iphone/alloy/controllers/subline.js\n\tResources/iphone/alloy/controllers/subline2.js\n\tResources/iphone/alloy/controllers/subline3.js\n\tResources/iphone/alloy/controllers/subline4.js\n\tResources/iphone/alloy/controllers/subline5.js\n\tResources/iphone/alloy/controllers/sublineDetails1.js\n\tResources/iphone/alloy/controllers/sublineDetails2.js\n\tResources/iphone/alloy/controllers/support.js\n\tResources/iphone/alloy/controllers/switchXOX.js\n\tResources/iphone/alloy/controllers/switchXOX2.js\n\tResources/iphone/alloy/controllers/switchXOX3.js\n\tResources/iphone/alloy/controllers/terms.js\n\tResources/iphone/alloy/controllers/userGuide.js\n\tResources/iphone/alloy/controllers/vas.js\n\tResources/iphone/alloy/models/Products.js\n\tResources/iphone/api.js\n\tapp/lib/api.js\n\tapp/views/prepaid.xml\n\tbuild/alloy/build.json\n\tbuild/android/assets/alloy/controllers/myAccount.js\n\tbuild/android/assets/alloy/controllers/settings.js\n\tbuild/android/assets/alloy/controllers/subline.js\n\tbuild/android/assets/alloy/controllers/subline2.js\n\tbuild/android/assets/alloy/controllers/subline3.js\n\tbuild/android/assets/alloy/controllers/subline4.js\n\tbuild/android/assets/alloy/controllers/subline5.js\n\tbuild/android/assets/alloy/controllers/sublineDetails1.js\n\tbuild/android/assets/alloy/controllers/sublineDetails2.js\n\tbuild/android/assets/alloy/controllers/support.js\n\tbuild/android/assets/alloy/controllers/switchXOX.js\n\tbuild/android/assets/alloy/controllers/switchXOX2.js\n\tbuild/android/assets/alloy/controllers/switchXOX3.js\n\tbuild/android/assets/alloy/controllers/terms.js\n\tbuild/android/assets/alloy/controllers/userGuide.js\n\tbuild/android/assets/alloy/controllers/vas.js\n\tbuild/android/bin/XOX.apk\n\tbuild/android/bin/app-unsigned.apk\n\tbuild/android/bin/app.ap_\n\tbuild/android/bin/assets/index.json\n\tbuild/android/bin/classes.dex\n\tbuild/android/bin/classes/com/mnc/xox/AssetCryptImpl.class\n\tbuild/android/bin/classes/com/mnc/xox/R$bool.class\n\tbuild/android/bin/classes/com/mnc/xox/R$color.class\n\tbuild/android/bin/classes/com/mnc/xox/R$dimen.class\n\tbuild/android/bin/classes/com/mnc/xox/R$id.class\n\tbuild/android/bin/classes/com/mnc/xox/R$integer.class\n\tbuild/android/build-manifest.json\n\tbuild/android/gen/com/mnc/xox/AssetCryptImpl.java\n\tbuild/android/gen/com/mnc/xox/R.java\n\tbuild/android/java-sources.txt\n\tbuild/iphone/XOX.xcodeproj/project.pbxproj\n\tbuild/iphone/build-manifest.json\n\tbuild/iphone/lib/libTiCore.a\n\tbuild/iphone/project.xcconfig\n\tbuild/map/Resources/android/alloy/controllers/accountDetails.js.map\n\tbuild/map/Resources/android/alloy/controllers/home.js.map\n\tbuild/map/Resources/android/alloy/controllers/internetManagement.js.map\n\nbuild/map/Resources/android/alloy/controllers/internetManagement2.js.map\n\nbuild/map/Resources/android/alloy/controllers/internetManagement3.js.map\n\nbuild/map/Resources/android/alloy/controllers/internetManagement4.js.map\n\tbuild/map/Resources/android/alloy/controllers/loyalty.js.map\n\tbuild/map/Resources/android/alloy/controllers/loyalty2.js.map\n\tbuild/map/Resources/android/alloy/controllers/menu.js.map\n\tbuild/map/Resources/android/alloy/controllers/myAccount.js.map\n\tbuild/map/Resources/android/alloy/controllers/profile.js.map\n\tbuild/map/Resources/android/alloy/controllers/settings.js.map\n\tbuild/map/Resources/android/api.js.map\n\tbuild/map/Resources/android/app.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/accountDetails.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/home.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/idd.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/iddVideo.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/iddVoice.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/index.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/internetManagement.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/internetManagement2.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/internetManagement3.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/menu.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/mobileInternet.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/myAccount.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/orderHistory.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/penang1758.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/prepaid.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/prepaidPlus.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/profile.js.map\n\tbuild/map/Resources/iphone/alloy/controllers/settings.js.map\n\tbuild/map/Resources/iphone/api.js.map\n\tbuild/map/Resources/iphone/app.js.map\n\tbuild/map/Resources/iphone/common.js.map","distinct":true,"url":"https://api.github.com/repos/mncwireless/xox/commits/155466471e65941fb6ea5c8de991cc0941bdb22c"}]}