1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2019-03-11 19:20:22 +00:00
48 changed files with 7633 additions and 5337 deletions
@@ -137,5 +137,5 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
}
protected Context mAppContext;
private final static String TAG = "OpenCVLoader/BaseLoaderCallback";
private final static String TAG = "OCV/BaseLoaderCallback";
}