{"push_id":1279828735,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"c3b4b7adfa4d2687297ce63a793525a3182022aa","before":"44eb7df393abfe40341c7335d714adf6cf8bfc66","commits":[{"sha":"c3b4b7adfa4d2687297ce63a793525a3182022aa","author":{"name":"liangzixin","email":"7d696de3ed25163452477fc30417e65ac6995510@qq.com"},"message":"Merge branch 'master' of https://github.com/liangzixin/dcgqxxmob\n\n# Conflicts:\n#\t.gradle/2.10/taskArtifacts/cache.properties.lock\n#\t.gradle/2.10/taskArtifacts/fileHashes.bin\n#\t.gradle/2.10/taskArtifacts/fileSnapshots.bin\n#\t.gradle/2.10/taskArtifacts/outputFileStates.bin\n#\t.gradle/2.10/taskArtifacts/taskArtifacts.bin\n#\taT/build.gradle\n#\taT/build/generated/source/buildConfig/androidTest/debug/com/xiangmu/wyxw/test/BuildConfig.java\n#\taT/build/generated/source/buildConfig/debug/com/xiangmu/wyxw/BuildConfig.java\n#\taT/build/intermediates/blame/res/debug/single/menu.json\n#\taT/build/intermediates/classes/debug/com/xiangmu/wyxw/BuildConfig.class\n#\taT/build/intermediates/exploded-aar/dcgqxxf163/barCodeTest/unspecified/jars/classes.jar\n#\taT/build/intermediates/exploded-aar/dcgqxxf163/barCodeTest/unspecified/jars/libs/zxing.jar\n#\taT/build/intermediates/incremental/mergeDebugResources/merger.xml\n#\taT/build/intermediates/manifests/full/debug/AndroidManifest.xml\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_QQZone_1_f862b4533d50b2807d21420871c8851214923174.jar\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_QQZone_2_26d20e454b360994bcba32079568b9780fa58697.jar\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_QQZone_3_9aa8535b28013b05c9254091f2cd0735cd71504e.jar\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_Sina_716a3ebb1909b461de1cc9c17362102fff5ff734.jar\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_WeiXin_1_0a52d9e0f5c8baa44314d0f7d8545b52082a98bd.jar\n#\taT/build/intermediates/pre-dexed/debug/SocialSDK_WeiXin_2_2f0d4b4ffa6979ea1ac74985cc9c0caa6a408a9c.jar\n#\taT/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.0.1_b32e3a20f8cbe4edd183bdb1e903145bc463ce7e.jar\n#\taT/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.0.1_db027fe1e836e59d3e5d8a6954289a34f22e3218.jar\n#\taT/build/intermediates/pre-dexed/debug/dcgqxxf163-barCodeTest-unspecified_8b41f704cc1a290007e32d8ffdbcf10ad121c23c.jar\n#\taT/build/intermediates/pre-dexed/debug/debug_f2724d6e907d0145787650e7854796668982a73b.jar\n#\taT/build/intermediates/pre-dexed/debug/gson-2.2.1_e39ce6c995b7718603f8e21d51a0eb5ef08c5d86.jar\n#\taT/build/intermediates/pre-dexed/debug/internal_impl-23.0.1_bd2d0690bd5194657147291165fcee92c657809e.jar\n#\taT/build/intermediates/pre-dexed/debug/org.apache.http.legacy_ce6b68318c5cefbbef42a5ee6913040152ba4ca0.jar\n#\taT/build/intermediates/pre-dexed/debug/support-annotations-23.0.1_ae0258d1322dae57ae0fd516c7530d89277f2876.jar\n#\taT/build/intermediates/pre-dexed/debug/umeng-analytics-v5.4.2_62da8ec3cea6d1adb2d1c47c75ae402e5b996dac.jar\n#\taT/build/intermediates/pre-dexed/debug/umeng_social_sdk_4300ff192a9341b9f9104e4b93d759c51db30441.jar\n#\taT/build/intermediates/pre-dexed/debug/xUtils_b99bb0a890538532c05c28a8d131779f7d0ad7cc.jar\n#\taT/build/intermediates/pre-dexed/debug/zxing_0328f8e4ef80c782adb27d45519f450daf891166.jar\n#\taT/build/intermediates/res/resources-debug-androidTest.ap_\n#\taT/build/intermediates/res/resources-debug.ap_\n#\taT/build/intermediates/transforms/dex/debug/folders/1000/1f/main/classes.dex\n#\taT/build/intermediates/transforms/mergeJavaRes/debug/jars/2/1f/main.jar\n#\taT/build/outputs/apk/aT-debug-unaligned.apk\n#\taT/build/outputs/apk/aT-debug.apk\n#\taT/build/outputs/logs/manifest-merger-debug-report.txt\n#\tbarCodeTest/build/intermediates/bundles/debug/classes.jar\n#\tbarCodeTest/build/intermediates/bundles/debug/libs/zxing.jar\n#\tbarCodeTest/build/intermediates/bundles/release/classes.jar\n#\tbarCodeTest/build/intermediates/bundles/release/libs/zxing.jar\n#\tbarCodeTest/build/intermediates/res/resources-debug-androidTest.ap_\n#\tbarCodeTest/build/outputs/aar/barCodeTest-debug.aar\n#\tbarCodeTest/build/outputs/aar/barCodeTest-release.aar","distinct":true,"url":"https://api.github.com/repos/liangzixin/dcgqxxmob/commits/c3b4b7adfa4d2687297ce63a793525a3182022aa"}]}
{"actor":{"display_login":"liangzixin"}}