{"push_id":982526448,"size":4,"distinct_size":4,"ref":"refs/heads/master","head":"3df58bc3aedf80564c2b5214da8902e2e6d0d497","before":"763819801a3088398a9ac6656b7401fb70046a85","commits":[{"sha":"b2473ace3fca6fe5c038eafca6b268870f469010","author":{"email":"7d187ca02d02356524ec9c6b37a209f300907c97@gmail.com","name":"xyz"},"message":"make app android 4.1 compatible","distinct":true,"url":"https://api.github.com/repos/smldragon/MaJiangScore/commits/b2473ace3fca6fe5c038eafca6b268870f469010"},{"sha":"62aa11d45a47e5b271f19b529e7f11d99b02dfd4","author":{"email":"7d187ca02d02356524ec9c6b37a209f300907c97@gmail.com","name":"xyz"},"message":"Merge remote-tracking branch 'github/master'\n\n# Conflicts:\n#\tApplication/build.gradle\n#\tApplication/build/generated/source/r/debug/com/oosbt/majiang/control/R.java\n#\tApplication/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml\n#\tApplication/build/intermediates/incremental/mergeAssets/debug/merger.xml\n#\tApplication/build/intermediates/incremental/mergeResources/androidTest/debug/merger.xml\n#\tApplication/build/intermediates/incremental/mergeResources/debug/merger.xml\n#\tApplication/build/intermediates/manifests/full/debug/AndroidManifest.xml\n#\tApplication/build/intermediates/res/debug/layout/contact.xml\n#\tApplication/build/intermediates/res/debug/layout/main.xml\n#\tApplication/build/intermediates/res/debug/layout/select_contact.xml\n#\tApplication/build/intermediates/res/debug/layout/send_message.xml\n#\tApplication/build/intermediates/res/debug/values-sw600dp/values-sw600dp.xml\n#\tApplication/build/intermediates/res/debug/values-v11/values-v11.xml\n#\tApplication/build/intermediates/res/debug/values-v21/values-v21.xml\n#\tApplication/build/intermediates/res/debug/values/values.xml\n#\tApplication/build/intermediates/resources/resources-debug-androidTest.ap_\n#\tApplication/build/intermediates/resources/resources-debug.ap_\n#\tApplication/build/intermediates/symbols/debug/R.txt\n#\tApplication/build/outputs/logs/manifest-merger-debug-report.txt\n#\tApplication/src/main/AndroidManifest.xml","distinct":true,"url":"https://api.github.com/repos/smldragon/MaJiangScore/commits/62aa11d45a47e5b271f19b529e7f11d99b02dfd4"},{"sha":"527ecfe3dada451800221a608a0538c5456051a8","author":{"email":"7d187ca02d02356524ec9c6b37a209f300907c97@gmail.com","name":"xyz"},"message":"Merge branch 'master' of C:\\Users\\Frank\\OneDrive\\GitHub\\AndroidStudioProjects\\MaJiangScore with conflicts.","distinct":true,"url":"https://api.github.com/repos/smldragon/MaJiangScore/commits/527ecfe3dada451800221a608a0538c5456051a8"},{"sha":"3df58bc3aedf80564c2b5214da8902e2e6d0d497","author":{"email":"7d187ca02d02356524ec9c6b37a209f300907c97@gmail.com","name":"xyz"},"message":"make app android 4.1 compatible","distinct":true,"url":"https://api.github.com/repos/smldragon/MaJiangScore/commits/3df58bc3aedf80564c2b5214da8902e2e6d0d497"}]}