Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

6 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

 keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java

@@ -1,5 +1,7 @@
package com.doumee.ticketmachine;

import android.text.TextUtils;

import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.utils.CircularQueue;
import com.doumee.keyCabinet.utils.i485.SportUtils;