OSDN > Trouver un logiciel > GOKIGEN > SCM > SVN > Commit

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TestSampleApp
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
mCalendar
A01f
prpr1
TransportHub

R/O
SSH
HTTPS

gokigen: Commit

Commit MetaInfo

Révision	410 (tree)
l'heure	2017-10-28 22:15:44
Auteur	mrsa

Message de Log

ビルドバージョンを更新する。

Change Summary

modified: android/AirA01b/trunk/.idea/misc.xml (diff)
modified: android/AirA01b/trunk/.idea/workspace.xml (diff)
modified: android/AirA01b/trunk/app/app.iml (diff)
modified: android/AirA01b/trunk/app/build.gradle (diff)
modified: android/AirA01b/trunk/build.gradle (diff)
modified: android/AirA01b/trunk/gradle/wrapper/gradle-wrapper.properties (diff)
modified: android/AirA01b/trunk/openCVLibrary320/build.gradle (diff)
modified: android/AirA01b/trunk/openCVLibrary320/openCVLibrary320.iml (diff)

Modification

--- android/AirA01b/trunk/.idea/misc.xml (revision 409)

+++ android/AirA01b/trunk/.idea/misc.xml (revision 410)

		@@ -235,17 +235,7 @@
235	235	</profile-state>
236	236	</entry>
237	237	</component>
238		- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
239		- <OptionsSetting value="true" id="Add" />
240		- <OptionsSetting value="true" id="Remove" />
241		- <OptionsSetting value="true" id="Checkout" />
242		- <OptionsSetting value="true" id="Update" />
243		- <OptionsSetting value="true" id="Status" />
244		- <OptionsSetting value="true" id="Edit" />
245		- <ConfirmationsSetting value="0" id="Add" />
246		- <ConfirmationsSetting value="0" id="Remove" />
247		- </component>
248		- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
	238	+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
249	239	<output url="file://$PROJECT_DIR$/build/classes" />
250	240	</component>
251	241	<component name="ProjectType">

--- android/AirA01b/trunk/.idea/workspace.xml (revision 409)

+++ android/AirA01b/trunk/.idea/workspace.xml (revision 410)

		@@ -32,9 +32,14 @@
32	32	</component>
33	33	<component name="ChangeListManager">
34	34	<list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="">
	35	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
35	36	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
36	37	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
37		- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java" />
	38	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
	39	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
	40	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
	41	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openCVLibrary320/build.gradle" afterPath="$PROJECT_DIR$/openCVLibrary320/build.gradle" />
	42	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" afterPath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" />
38	43	</list>
39	44	<ignored path="AirA01b.iws" />
40	45	<ignored path=".idea/workspace.xml" />

		@@ -86,12 +91,12 @@
86	91	<component name="GradleLocalSettings">
87	92	<option name="myGradleHomes">
88	93	<map>
89		- <entry key="$PROJECT_DIR$" value="C:\Users\MRSa\.gradle\wrapper\dists\gradle-3.3-all\55gk2rcmfc6p2dg9u9ohc3hw9\gradle-3.3" />
	94	+ <entry key="$PROJECT_DIR$" value="C:\Users\MRSa\.gradle\wrapper\dists\gradle-4.1-all\bzyivzo6n839fup2jbap0tjew\gradle-4.1" />
90	95	</map>
91	96	</option>
92	97	<option name="myGradleVersions">
93	98	<map>
94		- <entry key="$PROJECT_DIR$" value="3.3" />
	99	+ <entry key="$PROJECT_DIR$" value="4.1" />
95	100	</map>
96	101	</option>
97	102	<option name="availableProjects">

		@@ -129,7 +134,7 @@
129	134	<list>
130	135	<ExternalTaskPojo>
131	136	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
132		- <option name="name" value="mergeDebugProguardFiles" />
	137	+ <option name="name" value="splitsDiscoveryTaskDebugAndroidTest" />
133	138	</ExternalTaskPojo>
134	139	<ExternalTaskPojo>
135	140	<option name="description" value="Displays the sub-projects of root project 'AirA01b'." />

		@@ -142,10 +147,22 @@
142	147	</ExternalTaskPojo>
143	148	<ExternalTaskPojo>
144	149	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	150	+ <option name="name" value="bundleAppClassesRelease" />
	151	+ </ExternalTaskPojo>
	152	+ <ExternalTaskPojo>
	153	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	154	+ <option name="name" value="mergeReleaseConsumerProguardFiles" />
	155	+ </ExternalTaskPojo>
	156	+ <ExternalTaskPojo>
	157	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
145	158	<option name="name" value="validateSigningDebugAndroidTest" />
146	159	</ExternalTaskPojo>
147	160	<ExternalTaskPojo>
148	161	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	162	+ <option name="name" value="transformClassesWithDexBuilderForDebug" />
	163	+ </ExternalTaskPojo>
	164	+ <ExternalTaskPojo>
	165	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
149	166	<option name="name" value="transformNativeLibsWithSyncJniLibsForRelease" />
150	167	</ExternalTaskPojo>
151	168	<ExternalTaskPojo>

		@@ -154,7 +171,7 @@
154	171	</ExternalTaskPojo>
155	172	<ExternalTaskPojo>
156	173	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
157		- <option name="name" value="prepareDebugDependencies" />
	174	+ <option name="name" value="transformClassesAndResourcesWithPrepareIntermediateJarsForRelease" />
158	175	</ExternalTaskPojo>
159	176	<ExternalTaskPojo>
160	177	<option name="description" value="Assembles a bundle containing the library in debug." />

		@@ -167,10 +184,6 @@
167	184	</ExternalTaskPojo>
168	185	<ExternalTaskPojo>
169	186	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
170		- <option name="name" value="copyDebugLint" />
171		- </ExternalTaskPojo>
172		- <ExternalTaskPojo>
173		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
174	187	<option name="name" value="generateReleaseAssets" />
175	188	</ExternalTaskPojo>
176	189	<ExternalTaskPojo>

		@@ -193,14 +206,17 @@
193	206	<option name="name" value="model" />
194	207	</ExternalTaskPojo>
195	208	<ExternalTaskPojo>
	209	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	210	+ <option name="name" value="createReleaseCompatibleScreenManifests" />
	211	+ </ExternalTaskPojo>
	212	+ <ExternalTaskPojo>
196	213	<option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
197	214	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
198	215	<option name="name" value="mockableAndroidJar" />
199	216	</ExternalTaskPojo>
200	217	<ExternalTaskPojo>
201		- <option name="description" value="Prepare com.android.support:appcompat-v7:25.3.1" />
202	218	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
203		- <option name="name" value="prepareComAndroidSupportAppcompatV72531Library" />
	219	+ <option name="name" value="bundleAppClassesDebug" />
204	220	</ExternalTaskPojo>
205	221	<ExternalTaskPojo>
206	222	<option name="description" value="Displays the tasks runnable from root project 'AirA01b' (some of the displayed tasks may belong to subprojects)." />

		@@ -212,38 +228,28 @@
212	228	<option name="name" value="compileDebugSources" />
213	229	</ExternalTaskPojo>
214	230	<ExternalTaskPojo>
215		- <option name="description" value="Initializes a new Gradle build. [incubating]" />
216	231	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
217		- <option name="name" value="init" />
	232	+ <option name="name" value="transformClassesAndResourcesWithPrepareIntermediateJarsForDebug" />
218	233	</ExternalTaskPojo>
219	234	<ExternalTaskPojo>
	235	+ <option name="description" value="Initializes a new Gradle build." />
220	236	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
221		- <option name="name" value="packageReleaseRenderscript" />
	237	+ <option name="name" value="init" />
222	238	</ExternalTaskPojo>
223	239	<ExternalTaskPojo>
224	240	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
225		- <option name="name" value="mergeReleaseProguardFiles" />
	241	+ <option name="name" value="packageReleaseRenderscript" />
226	242	</ExternalTaskPojo>
227	243	<ExternalTaskPojo>
	244	+ <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
228	245	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
229		- <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
	246	+ <option name="name" value="deviceCheck" />
230	247	</ExternalTaskPojo>
231	248	<ExternalTaskPojo>
232		- <option name="description" value="Prepare com.android.support:support-media-compat:25.3.1" />
233	249	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
234		- <option name="name" value="prepareComAndroidSupportSupportMediaCompat2531Library" />
	250	+ <option name="name" value="transformNativeLibsWithIntermediateJniLibsForRelease" />
235	251	</ExternalTaskPojo>
236	252	<ExternalTaskPojo>
237		- <option name="description" value="Prepare com.android.support:support-vector-drawable:25.3.1" />
238		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
239		- <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2531Library" />
240		- </ExternalTaskPojo>
241		- <ExternalTaskPojo>
242		- <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
243		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
244		- <option name="name" value="deviceCheck" />
245		- </ExternalTaskPojo>
246		- <ExternalTaskPojo>
247	253	<option name="description" value="Displays all dependencies declared in root project 'AirA01b'." />
248	254	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
249	255	<option name="name" value="dependencies" />

		@@ -275,6 +281,10 @@
275	281	</ExternalTaskPojo>
276	282	<ExternalTaskPojo>
277	283	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	284	+ <option name="name" value="bundleAppClassesReleaseUnitTest" />
	285	+ </ExternalTaskPojo>
	286	+ <ExternalTaskPojo>
	287	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
278	288	<option name="name" value="compileDebugJavaWithJavac" />
279	289	</ExternalTaskPojo>
280	290	<ExternalTaskPojo>

		@@ -310,6 +320,10 @@
310	320	</ExternalTaskPojo>
311	321	<ExternalTaskPojo>
312	322	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	323	+ <option name="name" value="transformClassesWithPreDexForRelease" />
	324	+ </ExternalTaskPojo>
	325	+ <ExternalTaskPojo>
	326	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
313	327	<option name="name" value="mergeDebugShaders" />
314	328	</ExternalTaskPojo>
315	329	<ExternalTaskPojo>

		@@ -339,38 +353,37 @@
339	353	<option name="name" value="compileDebugUnitTestJavaWithJavac" />
340	354	</ExternalTaskPojo>
341	355	<ExternalTaskPojo>
342		- <option name="description" value="Prepare com.android.support:support-core-utils:25.3.1" />
343	356	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
344		- <option name="name" value="prepareComAndroidSupportSupportCoreUtils2531Library" />
	357	+ <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
345	358	</ExternalTaskPojo>
346	359	<ExternalTaskPojo>
347		- <option name="description" value="Prepare com.android.support:support-v4:25.3.1" />
348	360	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
349		- <option name="name" value="prepareComAndroidSupportSupportV42531Library" />
	361	+ <option name="name" value="preDebugAndroidTestBuild" />
350	362	</ExternalTaskPojo>
351	363	<ExternalTaskPojo>
352	364	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
353		- <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
	365	+ <option name="name" value="processDebugAndroidTestJavaRes" />
354	366	</ExternalTaskPojo>
355	367	<ExternalTaskPojo>
	368	+ <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
356	369	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
357		- <option name="name" value="transformClassesWithDexForDebug" />
	370	+ <option name="name" value="extractDebugAnnotations" />
358	371	</ExternalTaskPojo>
359	372	<ExternalTaskPojo>
360	373	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
361		- <option name="name" value="preDebugAndroidTestBuild" />
	374	+ <option name="name" value="processReleaseUnitTestJavaRes" />
362	375	</ExternalTaskPojo>
363	376	<ExternalTaskPojo>
364	377	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
365		- <option name="name" value="processDebugAndroidTestJavaRes" />
	378	+ <option name="name" value="javaPreCompileDebugAndroidTest" />
366	379	</ExternalTaskPojo>
367	380	<ExternalTaskPojo>
368	381	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
369		- <option name="name" value="processReleaseUnitTestJavaRes" />
	382	+ <option name="name" value="splitsDiscoveryTaskDebug" />
370	383	</ExternalTaskPojo>
371	384	<ExternalTaskPojo>
372	385	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
373		- <option name="name" value="javaPreCompileDebugAndroidTest" />
	386	+ <option name="name" value="bundleAppClassesDebugUnitTest" />
374	387	</ExternalTaskPojo>
375	388	<ExternalTaskPojo>
376	389	<option name="description" value="Uninstalls the Release build." />

		@@ -391,18 +404,14 @@
391	404	</ExternalTaskPojo>
392	405	<ExternalTaskPojo>
393	406	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
394		- <option name="name" value="generateDebugAndroidTestSources" />
	407	+ <option name="name" value="transformNativeLibsWithIntermediateJniLibsForDebug" />
395	408	</ExternalTaskPojo>
396	409	<ExternalTaskPojo>
397	410	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
398		- <option name="name" value="prepareDebugAndroidTestDependencies" />
	411	+ <option name="name" value="generateDebugAndroidTestSources" />
399	412	</ExternalTaskPojo>
400	413	<ExternalTaskPojo>
401	414	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
402		- <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
403		- </ExternalTaskPojo>
404		- <ExternalTaskPojo>
405		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
406	415	<option name="name" value="transformClassesAndResourcesWithSyncLibJarsForDebug" />
407	416	</ExternalTaskPojo>
408	417	<ExternalTaskPojo>

		@@ -415,6 +424,10 @@
415	424	</ExternalTaskPojo>
416	425	<ExternalTaskPojo>
417	426	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	427	+ <option name="name" value="verifyReleaseResources" />
	428	+ </ExternalTaskPojo>
	429	+ <ExternalTaskPojo>
	430	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
418	431	<option name="name" value="packageDebugResources" />
419	432	</ExternalTaskPojo>
420	433	<ExternalTaskPojo>

		@@ -427,14 +440,22 @@
427	440	</ExternalTaskPojo>
428	441	<ExternalTaskPojo>
429	442	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	443	+ <option name="name" value="createDebugCompatibleScreenManifests" />
	444	+ </ExternalTaskPojo>
	445	+ <ExternalTaskPojo>
	446	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
430	447	<option name="name" value="mergeReleaseJniLibFolders" />
431	448	</ExternalTaskPojo>
432	449	<ExternalTaskPojo>
433	450	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
434		- <option name="name" value="prepareReleaseDependencies" />
	451	+ <option name="name" value="prepareLintJar" />
435	452	</ExternalTaskPojo>
436	453	<ExternalTaskPojo>
437	454	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	455	+ <option name="name" value="transformDexWithDexForRelease" />
	456	+ </ExternalTaskPojo>
	457	+ <ExternalTaskPojo>
	458	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
438	459	<option name="name" value="processReleaseResources" />
439	460	</ExternalTaskPojo>
440	461	<ExternalTaskPojo>

		@@ -466,11 +487,11 @@
466	487	</ExternalTaskPojo>
467	488	<ExternalTaskPojo>
468	489	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
469		- <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
	490	+ <option name="name" value="preReleaseBuild" />
470	491	</ExternalTaskPojo>
471	492	<ExternalTaskPojo>
472	493	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
473		- <option name="name" value="preReleaseBuild" />
	494	+ <option name="name" value="writeDebugApplicationId" />
474	495	</ExternalTaskPojo>
475	496	<ExternalTaskPojo>
476	497	<option name="description" value="Assembles all variants of all applications and secondary packages." />

		@@ -479,13 +500,9 @@
479	500	</ExternalTaskPojo>
480	501	<ExternalTaskPojo>
481	502	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
482		- <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
	503	+ <option name="name" value="createFullJarDebug" />
483	504	</ExternalTaskPojo>
484	505	<ExternalTaskPojo>
485		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
486		- <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
487		- </ExternalTaskPojo>
488		- <ExternalTaskPojo>
489	506	<option name="description" value="Displays a help message." />
490	507	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
491	508	<option name="name" value="help" />

		@@ -495,14 +512,13 @@
495	512	<option name="name" value="compileReleaseUnitTestSources" />
496	513	</ExternalTaskPojo>
497	514	<ExternalTaskPojo>
498		- <option name="description" value="Prepare com.android.support:exifinterface:25.3.1" />
	515	+ <option name="description" value="Installs the android (on device) tests for the Debug build." />
499	516	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
500		- <option name="name" value="prepareComAndroidSupportExifinterface2531Library" />
	517	+ <option name="name" value="installDebugAndroidTest" />
501	518	</ExternalTaskPojo>
502	519	<ExternalTaskPojo>
503		- <option name="description" value="Installs the android (on device) tests for the Debug build." />
504	520	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
505		- <option name="name" value="installDebugAndroidTest" />
	521	+ <option name="name" value="transformClassesWithDexBuilderForDebugAndroidTest" />
506	522	</ExternalTaskPojo>
507	523	<ExternalTaskPojo>
508	524	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />

		@@ -513,20 +529,14 @@
513	529	<option name="name" value="javaPreCompileReleaseUnitTest" />
514	530	</ExternalTaskPojo>
515	531	<ExternalTaskPojo>
516		- <option name="description" value="Prepare com.android.support:recyclerview-v7:25.3.1" />
517	532	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
518		- <option name="name" value="prepareComAndroidSupportRecyclerviewV72531Library" />
	533	+ <option name="name" value="javaPreCompileRelease" />
519	534	</ExternalTaskPojo>
520	535	<ExternalTaskPojo>
521		- <option name="description" value="Prepare com.android.support:support-core-ui:25.3.1" />
522	536	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
523		- <option name="name" value="prepareComAndroidSupportSupportCoreUi2531Library" />
	537	+ <option name="name" value="splitsDiscoveryTaskRelease" />
524	538	</ExternalTaskPojo>
525	539	<ExternalTaskPojo>
526		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
527		- <option name="name" value="javaPreCompileRelease" />
528		- </ExternalTaskPojo>
529		- <ExternalTaskPojo>
530	540	<option name="description" value="Runs all device checks on currently connected devices." />
531	541	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
532	542	<option name="name" value="connectedCheck" />

		@@ -537,6 +547,10 @@
537	547	<option name="name" value="connectedDebugAndroidTest" />
538	548	</ExternalTaskPojo>
539	549	<ExternalTaskPojo>
	550	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	551	+ <option name="name" value="transformDexArchiveWithDexMergerForDebug" />
	552	+ </ExternalTaskPojo>
	553	+ <ExternalTaskPojo>
540	554	<option name="description" value="Uninstall all applications." />
541	555	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
542	556	<option name="name" value="uninstallAll" />

		@@ -563,7 +577,12 @@
563	577	<option name="name" value="validateSigningDebug" />
564	578	</ExternalTaskPojo>
565	579	<ExternalTaskPojo>
	580	+ <option name="description" value="Extracts Android annotations for the release variant into the archive file" />
566	581	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	582	+ <option name="name" value="extractReleaseAnnotations" />
	583	+ </ExternalTaskPojo>
	584	+ <ExternalTaskPojo>
	585	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
567	586	<option name="name" value="compileDebugAidl" />
568	587	</ExternalTaskPojo>
569	588	<ExternalTaskPojo>

		@@ -571,7 +590,7 @@
571	590	<option name="name" value="mergeDebugResources" />
572	591	</ExternalTaskPojo>
573	592	<ExternalTaskPojo>
574		- <option name="description" value="Generates Gradle wrapper files. [incubating]" />
	593	+ <option name="description" value="Generates Gradle wrapper files." />
575	594	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
576	595	<option name="name" value="wrapper" />
577	596	</ExternalTaskPojo>

		@@ -614,6 +633,10 @@
614	633	</ExternalTaskPojo>
615	634	<ExternalTaskPojo>
616	635	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	636	+ <option name="name" value="transformDexArchiveWithExternalLibsDexMergerForDebugAndroidTest" />
	637	+ </ExternalTaskPojo>
	638	+ <ExternalTaskPojo>
	639	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
617	640	<option name="name" value="generateDebugSources" />
618	641	</ExternalTaskPojo>
619	642	<ExternalTaskPojo>

		@@ -626,19 +649,15 @@
626	649	</ExternalTaskPojo>
627	650	<ExternalTaskPojo>
628	651	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
629		- <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
630		- </ExternalTaskPojo>
631		- <ExternalTaskPojo>
632		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
633	652	<option name="name" value="assembleDebugAndroidTest" />
634	653	</ExternalTaskPojo>
635	654	<ExternalTaskPojo>
636	655	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
637		- <option name="name" value="copyReleaseLint" />
	656	+ <option name="name" value="processDebugJavaRes" />
638	657	</ExternalTaskPojo>
639	658	<ExternalTaskPojo>
640	659	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
641		- <option name="name" value="processDebugJavaRes" />
	660	+ <option name="name" value="consumeConfigAttr" />
642	661	</ExternalTaskPojo>
643	662	<ExternalTaskPojo>
644	663	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />

		@@ -650,17 +669,9 @@
650	669	</ExternalTaskPojo>
651	670	<ExternalTaskPojo>
652	671	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
653		- <option name="name" value="jarReleaseClasses" />
654		- </ExternalTaskPojo>
655		- <ExternalTaskPojo>
656		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
657	672	<option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
658	673	</ExternalTaskPojo>
659	674	<ExternalTaskPojo>
660		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
661		- <option name="name" value="prepareReleaseUnitTestDependencies" />
662		- </ExternalTaskPojo>
663		- <ExternalTaskPojo>
664	675	<option name="description" value="Run unit tests for all variants." />
665	676	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
666	677	<option name="name" value="test" />

		@@ -682,12 +693,7 @@
682	693	<option name="name" value="preReleaseUnitTestBuild" />
683	694	</ExternalTaskPojo>
684	695	<ExternalTaskPojo>
685		- <option name="description" value="Prepare com.android.support:support-fragment:25.3.1" />
686	696	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
687		- <option name="name" value="prepareComAndroidSupportSupportFragment2531Library" />
688		- </ExternalTaskPojo>
689		- <ExternalTaskPojo>
690		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
691	697	<option name="name" value="generateDebugResValues" />
692	698	</ExternalTaskPojo>
693	699	<ExternalTaskPojo>

		@@ -700,11 +706,6 @@
700	706	<option name="name" value="javaPreCompileDebug" />
701	707	</ExternalTaskPojo>
702	708	<ExternalTaskPojo>
703		- <option name="description" value="Prepare com.android.support:support-compat:25.3.1" />
704		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
705		- <option name="name" value="prepareComAndroidSupportSupportCompat2531Library" />
706		- </ExternalTaskPojo>
707		- <ExternalTaskPojo>
708	709	<option name="description" value="Run unit tests for the debug build." />
709	710	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
710	711	<option name="name" value="testDebugUnitTest" />

		@@ -715,19 +716,6 @@
715	716	<option name="name" value="connectedAndroidTest" />
716	717	</ExternalTaskPojo>
717	718	<ExternalTaskPojo>
718		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
719		- <option name="name" value="jarDebugClasses" />
720		- </ExternalTaskPojo>
721		- <ExternalTaskPojo>
722		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
723		- <option name="name" value="transformClassesWithDexForRelease" />
724		- </ExternalTaskPojo>
725		- <ExternalTaskPojo>
726		- <option name="description" value="Prepare com.android.support:animated-vector-drawable:25.3.1" />
727		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
728		- <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2531Library" />
729		- </ExternalTaskPojo>
730		- <ExternalTaskPojo>
731	719	<option name="description" value="Installs the Debug build." />
732	720	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
733	721	<option name="name" value="installDebug" />

		@@ -775,9 +763,8 @@
775	763	<option name="name" value="generateDebugAssets" />
776	764	</ExternalTaskPojo>
777	765	<ExternalTaskPojo>
778		- <option name="description" value="Prepare com.android.support:preference-v7:25.3.1" />
779	766	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
780		- <option name="name" value="prepareComAndroidSupportPreferenceV72531Library" />
	767	+ <option name="name" value="transformDexArchiveWithDexMergerForDebugAndroidTest" />
781	768	</ExternalTaskPojo>
782	769	<ExternalTaskPojo>
783	770	<option name="description" value="Displays the dependent components of components in root project 'AirA01b'. [incubating]" />

		@@ -812,6 +799,10 @@
812	799	</ExternalTaskPojo>
813	800	<ExternalTaskPojo>
814	801	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	802	+ <option name="name" value="createFullJarRelease" />
	803	+ </ExternalTaskPojo>
	804	+ <ExternalTaskPojo>
	805	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
815	806	<option name="name" value="compileDebugRenderscript" />
816	807	</ExternalTaskPojo>
817	808	<ExternalTaskPojo>

		@@ -824,10 +815,6 @@
824	815	</ExternalTaskPojo>
825	816	<ExternalTaskPojo>
826	817	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
827		- <option name="name" value="prepareDebugUnitTestDependencies" />
828		- </ExternalTaskPojo>
829		- <ExternalTaskPojo>
830		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
831	818	<option name="name" value="generateReleaseResources" />
832	819	</ExternalTaskPojo>
833	820	<ExternalTaskPojo>

		@@ -836,6 +823,10 @@
836	823	<option name="name" value="lintVitalRelease" />
837	824	</ExternalTaskPojo>
838	825	<ExternalTaskPojo>
	826	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	827	+ <option name="name" value="platformAttrExtractor" />
	828	+ </ExternalTaskPojo>
	829	+ <ExternalTaskPojo>
839	830	<option name="description" value="Uninstalls the Debug build." />
840	831	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
841	832	<option name="name" value="uninstallDebug" />

		@@ -855,6 +846,10 @@
855	846	</ExternalTaskPojo>
856	847	<ExternalTaskPojo>
857	848	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	849	+ <option name="name" value="bundleAppClassesDebugAndroidTest" />
	850	+ </ExternalTaskPojo>
	851	+ <ExternalTaskPojo>
	852	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
858	853	<option name="name" value="clean" />
859	854	</ExternalTaskPojo>
860	855	<ExternalTaskPojo>

		@@ -866,6 +861,10 @@
866	861	<option name="name" value="generateDebugBuildConfig" />
867	862	</ExternalTaskPojo>
868	863	<ExternalTaskPojo>
	864	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	865	+ <option name="name" value="transformDexArchiveWithExternalLibsDexMergerForDebug" />
	866	+ </ExternalTaskPojo>
	867	+ <ExternalTaskPojo>
869	868	<option name="description" value="Assembles and tests this project." />
870	869	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
871	870	<option name="name" value="build" />

		@@ -877,6 +876,14 @@
877	876	</ExternalTaskPojo>
878	877	<ExternalTaskPojo>
879	878	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	879	+ <option name="name" value="resolveConfigAttr" />
	880	+ </ExternalTaskPojo>
	881	+ <ExternalTaskPojo>
	882	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	883	+ <option name="name" value="mergeDebugConsumerProguardFiles" />
	884	+ </ExternalTaskPojo>
	885	+ <ExternalTaskPojo>
	886	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
880	887	<option name="name" value="compileDebugAndroidTestRenderscript" />
881	888	</ExternalTaskPojo>
882	889	<ExternalTaskPojo>

		@@ -889,6 +896,10 @@
889	896	</ExternalTaskPojo>
890	897	<ExternalTaskPojo>
891	898	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
	899	+ <option name="name" value="writeReleaseApplicationId" />
	900	+ </ExternalTaskPojo>
	901	+ <ExternalTaskPojo>
	902	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
892	903	<option name="name" value="packageDebugAndroidTest" />
893	904	</ExternalTaskPojo>
894	905	<ExternalTaskPojo>

		@@ -907,6 +918,10 @@
907	918	<value>
908	919	<list>
909	920	<ExternalTaskPojo>
	921	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	922	+ <option name="name" value="splitsDiscoveryTaskDebugAndroidTest" />
	923	+ </ExternalTaskPojo>
	924	+ <ExternalTaskPojo>
910	925	<option name="description" value="Displays the sub-projects of project ':app'." />
911	926	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
912	927	<option name="name" value="projects" />

		@@ -913,15 +928,19 @@
913	928	</ExternalTaskPojo>
914	929	<ExternalTaskPojo>
915	930	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	931	+ <option name="name" value="bundleAppClassesRelease" />
	932	+ </ExternalTaskPojo>
	933	+ <ExternalTaskPojo>
	934	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
916	935	<option name="name" value="validateSigningDebugAndroidTest" />
917	936	</ExternalTaskPojo>
918	937	<ExternalTaskPojo>
919	938	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
920		- <option name="name" value="assembleReleaseUnitTest" />
	939	+ <option name="name" value="transformClassesWithDexBuilderForDebug" />
921	940	</ExternalTaskPojo>
922	941	<ExternalTaskPojo>
923	942	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
924		- <option name="name" value="prepareDebugDependencies" />
	943	+ <option name="name" value="assembleReleaseUnitTest" />
925	944	</ExternalTaskPojo>
926	945	<ExternalTaskPojo>
927	946	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />

		@@ -941,6 +960,10 @@
941	960	<option name="name" value="assembleDebugUnitTest" />
942	961	</ExternalTaskPojo>
943	962	<ExternalTaskPojo>
	963	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	964	+ <option name="name" value="createReleaseCompatibleScreenManifests" />
	965	+ </ExternalTaskPojo>
	966	+ <ExternalTaskPojo>
944	967	<option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
945	968	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
946	969	<option name="name" value="mockableAndroidJar" />

		@@ -951,9 +974,8 @@
951	974	<option name="name" value="model" />
952	975	</ExternalTaskPojo>
953	976	<ExternalTaskPojo>
954		- <option name="description" value="Prepare com.android.support:appcompat-v7:25.3.1" />
955	977	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
956		- <option name="name" value="prepareComAndroidSupportAppcompatV72531Library" />
	978	+ <option name="name" value="bundleAppClassesDebug" />
957	979	</ExternalTaskPojo>
958	980	<ExternalTaskPojo>
959	981	<option name="description" value="Displays the tasks runnable from project ':app'." />

		@@ -965,20 +987,6 @@
965	987	<option name="name" value="compileDebugSources" />
966	988	</ExternalTaskPojo>
967	989	<ExternalTaskPojo>
968		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
969		- <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
970		- </ExternalTaskPojo>
971		- <ExternalTaskPojo>
972		- <option name="description" value="Prepare com.android.support:support-media-compat:25.3.1" />
973		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
974		- <option name="name" value="prepareComAndroidSupportSupportMediaCompat2531Library" />
975		- </ExternalTaskPojo>
976		- <ExternalTaskPojo>
977		- <option name="description" value="Prepare com.android.support:support-vector-drawable:25.3.1" />
978		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
979		- <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2531Library" />
980		- </ExternalTaskPojo>
981		- <ExternalTaskPojo>
982	990	<option name="description" value="Runs all device checks using Device Providers and Test Servers." />
983	991	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
984	992	<option name="name" value="deviceCheck" />

		@@ -1015,6 +1023,10 @@
1015	1023	</ExternalTaskPojo>
1016	1024	<ExternalTaskPojo>
1017	1025	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1026	+ <option name="name" value="bundleAppClassesReleaseUnitTest" />
	1027	+ </ExternalTaskPojo>
	1028	+ <ExternalTaskPojo>
	1029	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1018	1030	<option name="name" value="compileDebugJavaWithJavac" />
1019	1031	</ExternalTaskPojo>
1020	1032	<ExternalTaskPojo>

		@@ -1046,6 +1058,10 @@
1046	1058	</ExternalTaskPojo>
1047	1059	<ExternalTaskPojo>
1048	1060	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1061	+ <option name="name" value="transformClassesWithPreDexForRelease" />
	1062	+ </ExternalTaskPojo>
	1063	+ <ExternalTaskPojo>
	1064	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1049	1065	<option name="name" value="mergeDebugShaders" />
1050	1066	</ExternalTaskPojo>
1051	1067	<ExternalTaskPojo>

		@@ -1075,40 +1091,34 @@
1075	1091	<option name="name" value="compileDebugUnitTestJavaWithJavac" />
1076	1092	</ExternalTaskPojo>
1077	1093	<ExternalTaskPojo>
1078		- <option name="description" value="Prepare com.android.support:support-core-utils:25.3.1" />
1079	1094	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1080		- <option name="name" value="prepareComAndroidSupportSupportCoreUtils2531Library" />
	1095	+ <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
1081	1096	</ExternalTaskPojo>
1082	1097	<ExternalTaskPojo>
1083		- <option name="description" value="Prepare com.android.support:support-v4:25.3.1" />
1084	1098	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1085		- <option name="name" value="prepareComAndroidSupportSupportV42531Library" />
	1099	+ <option name="name" value="preDebugAndroidTestBuild" />
1086	1100	</ExternalTaskPojo>
1087	1101	<ExternalTaskPojo>
1088	1102	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1089		- <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
	1103	+ <option name="name" value="processDebugAndroidTestJavaRes" />
1090	1104	</ExternalTaskPojo>
1091	1105	<ExternalTaskPojo>
1092	1106	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1093		- <option name="name" value="transformClassesWithDexForDebug" />
	1107	+ <option name="name" value="processReleaseUnitTestJavaRes" />
1094	1108	</ExternalTaskPojo>
1095	1109	<ExternalTaskPojo>
1096	1110	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1097		- <option name="name" value="preDebugAndroidTestBuild" />
	1111	+ <option name="name" value="javaPreCompileDebugAndroidTest" />
1098	1112	</ExternalTaskPojo>
1099	1113	<ExternalTaskPojo>
1100	1114	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1101		- <option name="name" value="processDebugAndroidTestJavaRes" />
	1115	+ <option name="name" value="splitsDiscoveryTaskDebug" />
1102	1116	</ExternalTaskPojo>
1103	1117	<ExternalTaskPojo>
1104	1118	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1105		- <option name="name" value="processReleaseUnitTestJavaRes" />
	1119	+ <option name="name" value="bundleAppClassesDebugUnitTest" />
1106	1120	</ExternalTaskPojo>
1107	1121	<ExternalTaskPojo>
1108		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1109		- <option name="name" value="javaPreCompileDebugAndroidTest" />
1110		- </ExternalTaskPojo>
1111		- <ExternalTaskPojo>
1112	1122	<option name="description" value="Uninstalls the Release build." />
1113	1123	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1114	1124	<option name="name" value="uninstallRelease" />

		@@ -1127,31 +1137,31 @@
1127	1137	</ExternalTaskPojo>
1128	1138	<ExternalTaskPojo>
1129	1139	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1130		- <option name="name" value="prepareDebugAndroidTestDependencies" />
	1140	+ <option name="name" value="checkReleaseManifest" />
1131	1141	</ExternalTaskPojo>
1132	1142	<ExternalTaskPojo>
1133	1143	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1134		- <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
	1144	+ <option name="name" value="javaPreCompileDebugUnitTest" />
1135	1145	</ExternalTaskPojo>
1136	1146	<ExternalTaskPojo>
1137	1147	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1138		- <option name="name" value="checkReleaseManifest" />
	1148	+ <option name="name" value="compileDebugAndroidTestSources" />
1139	1149	</ExternalTaskPojo>
1140	1150	<ExternalTaskPojo>
1141	1151	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1142		- <option name="name" value="javaPreCompileDebugUnitTest" />
	1152	+ <option name="name" value="createDebugCompatibleScreenManifests" />
1143	1153	</ExternalTaskPojo>
1144	1154	<ExternalTaskPojo>
1145	1155	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1146		- <option name="name" value="compileDebugAndroidTestSources" />
	1156	+ <option name="name" value="mergeReleaseJniLibFolders" />
1147	1157	</ExternalTaskPojo>
1148	1158	<ExternalTaskPojo>
1149	1159	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1150		- <option name="name" value="mergeReleaseJniLibFolders" />
	1160	+ <option name="name" value="prepareLintJar" />
1151	1161	</ExternalTaskPojo>
1152	1162	<ExternalTaskPojo>
1153	1163	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1154		- <option name="name" value="prepareReleaseDependencies" />
	1164	+ <option name="name" value="transformDexWithDexForRelease" />
1155	1165	</ExternalTaskPojo>
1156	1166	<ExternalTaskPojo>
1157	1167	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />

		@@ -1186,11 +1196,11 @@
1186	1196	</ExternalTaskPojo>
1187	1197	<ExternalTaskPojo>
1188	1198	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1189		- <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
	1199	+ <option name="name" value="preReleaseBuild" />
1190	1200	</ExternalTaskPojo>
1191	1201	<ExternalTaskPojo>
1192	1202	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1193		- <option name="name" value="preReleaseBuild" />
	1203	+ <option name="name" value="writeDebugApplicationId" />
1194	1204	</ExternalTaskPojo>
1195	1205	<ExternalTaskPojo>
1196	1206	<option name="description" value="Assembles all variants of all applications and secondary packages." />

		@@ -1198,14 +1208,6 @@
1198	1208	<option name="name" value="assemble" />
1199	1209	</ExternalTaskPojo>
1200	1210	<ExternalTaskPojo>
1201		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1202		- <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
1203		- </ExternalTaskPojo>
1204		- <ExternalTaskPojo>
1205		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1206		- <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
1207		- </ExternalTaskPojo>
1208		- <ExternalTaskPojo>
1209	1211	<option name="description" value="Displays a help message." />
1210	1212	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1211	1213	<option name="name" value="help" />

		@@ -1215,14 +1217,13 @@
1215	1217	<option name="name" value="compileReleaseUnitTestSources" />
1216	1218	</ExternalTaskPojo>
1217	1219	<ExternalTaskPojo>
1218		- <option name="description" value="Prepare com.android.support:exifinterface:25.3.1" />
	1220	+ <option name="description" value="Installs the android (on device) tests for the Debug build." />
1219	1221	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1220		- <option name="name" value="prepareComAndroidSupportExifinterface2531Library" />
	1222	+ <option name="name" value="installDebugAndroidTest" />
1221	1223	</ExternalTaskPojo>
1222	1224	<ExternalTaskPojo>
1223		- <option name="description" value="Installs the android (on device) tests for the Debug build." />
1224	1225	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1225		- <option name="name" value="installDebugAndroidTest" />
	1226	+ <option name="name" value="transformClassesWithDexBuilderForDebugAndroidTest" />
1226	1227	</ExternalTaskPojo>
1227	1228	<ExternalTaskPojo>
1228	1229	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />

		@@ -1233,20 +1234,14 @@
1233	1234	<option name="name" value="javaPreCompileReleaseUnitTest" />
1234	1235	</ExternalTaskPojo>
1235	1236	<ExternalTaskPojo>
1236		- <option name="description" value="Prepare com.android.support:recyclerview-v7:25.3.1" />
1237	1237	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1238		- <option name="name" value="prepareComAndroidSupportRecyclerviewV72531Library" />
	1238	+ <option name="name" value="javaPreCompileRelease" />
1239	1239	</ExternalTaskPojo>
1240	1240	<ExternalTaskPojo>
1241		- <option name="description" value="Prepare com.android.support:support-core-ui:25.3.1" />
1242	1241	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1243		- <option name="name" value="prepareComAndroidSupportSupportCoreUi2531Library" />
	1242	+ <option name="name" value="splitsDiscoveryTaskRelease" />
1244	1243	</ExternalTaskPojo>
1245	1244	<ExternalTaskPojo>
1246		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1247		- <option name="name" value="javaPreCompileRelease" />
1248		- </ExternalTaskPojo>
1249		- <ExternalTaskPojo>
1250	1245	<option name="description" value="Runs all device checks on currently connected devices." />
1251	1246	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1252	1247	<option name="name" value="connectedCheck" />

		@@ -1257,6 +1252,10 @@
1257	1252	<option name="name" value="connectedDebugAndroidTest" />
1258	1253	</ExternalTaskPojo>
1259	1254	<ExternalTaskPojo>
	1255	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1256	+ <option name="name" value="transformDexArchiveWithDexMergerForDebug" />
	1257	+ </ExternalTaskPojo>
	1258	+ <ExternalTaskPojo>
1260	1259	<option name="description" value="Uninstall all applications." />
1261	1260	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1262	1261	<option name="name" value="uninstallAll" />

		@@ -1329,6 +1328,10 @@
1329	1328	</ExternalTaskPojo>
1330	1329	<ExternalTaskPojo>
1331	1330	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1331	+ <option name="name" value="transformDexArchiveWithExternalLibsDexMergerForDebugAndroidTest" />
	1332	+ </ExternalTaskPojo>
	1333	+ <ExternalTaskPojo>
	1334	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1332	1335	<option name="name" value="generateDebugSources" />
1333	1336	</ExternalTaskPojo>
1334	1337	<ExternalTaskPojo>

		@@ -1341,15 +1344,15 @@
1341	1344	</ExternalTaskPojo>
1342	1345	<ExternalTaskPojo>
1343	1346	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1344		- <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
	1347	+ <option name="name" value="assembleDebugAndroidTest" />
1345	1348	</ExternalTaskPojo>
1346	1349	<ExternalTaskPojo>
1347	1350	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1348		- <option name="name" value="assembleDebugAndroidTest" />
	1351	+ <option name="name" value="processDebugJavaRes" />
1349	1352	</ExternalTaskPojo>
1350	1353	<ExternalTaskPojo>
1351	1354	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1352		- <option name="name" value="processDebugJavaRes" />
	1355	+ <option name="name" value="consumeConfigAttr" />
1353	1356	</ExternalTaskPojo>
1354	1357	<ExternalTaskPojo>
1355	1358	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />

		@@ -1361,17 +1364,9 @@
1361	1364	</ExternalTaskPojo>
1362	1365	<ExternalTaskPojo>
1363	1366	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1364		- <option name="name" value="jarReleaseClasses" />
1365		- </ExternalTaskPojo>
1366		- <ExternalTaskPojo>
1367		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1368	1367	<option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
1369	1368	</ExternalTaskPojo>
1370	1369	<ExternalTaskPojo>
1371		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1372		- <option name="name" value="prepareReleaseUnitTestDependencies" />
1373		- </ExternalTaskPojo>
1374		- <ExternalTaskPojo>
1375	1370	<option name="description" value="Run unit tests for all variants." />
1376	1371	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1377	1372	<option name="name" value="test" />

		@@ -1393,12 +1388,7 @@
1393	1388	<option name="name" value="preReleaseUnitTestBuild" />
1394	1389	</ExternalTaskPojo>
1395	1390	<ExternalTaskPojo>
1396		- <option name="description" value="Prepare com.android.support:support-fragment:25.3.1" />
1397	1391	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1398		- <option name="name" value="prepareComAndroidSupportSupportFragment2531Library" />
1399		- </ExternalTaskPojo>
1400		- <ExternalTaskPojo>
1401		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1402	1392	<option name="name" value="generateDebugResValues" />
1403	1393	</ExternalTaskPojo>
1404	1394	<ExternalTaskPojo>

		@@ -1411,11 +1401,6 @@
1411	1401	<option name="name" value="javaPreCompileDebug" />
1412	1402	</ExternalTaskPojo>
1413	1403	<ExternalTaskPojo>
1414		- <option name="description" value="Prepare com.android.support:support-compat:25.3.1" />
1415		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1416		- <option name="name" value="prepareComAndroidSupportSupportCompat2531Library" />
1417		- </ExternalTaskPojo>
1418		- <ExternalTaskPojo>
1419	1404	<option name="description" value="Run unit tests for the debug build." />
1420	1405	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1421	1406	<option name="name" value="testDebugUnitTest" />

		@@ -1426,19 +1411,6 @@
1426	1411	<option name="name" value="connectedAndroidTest" />
1427	1412	</ExternalTaskPojo>
1428	1413	<ExternalTaskPojo>
1429		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1430		- <option name="name" value="jarDebugClasses" />
1431		- </ExternalTaskPojo>
1432		- <ExternalTaskPojo>
1433		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1434		- <option name="name" value="transformClassesWithDexForRelease" />
1435		- </ExternalTaskPojo>
1436		- <ExternalTaskPojo>
1437		- <option name="description" value="Prepare com.android.support:animated-vector-drawable:25.3.1" />
1438		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1439		- <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2531Library" />
1440		- </ExternalTaskPojo>
1441		- <ExternalTaskPojo>
1442	1414	<option name="description" value="Installs the Debug build." />
1443	1415	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1444	1416	<option name="name" value="installDebug" />

		@@ -1486,9 +1458,8 @@
1486	1458	<option name="name" value="generateDebugAssets" />
1487	1459	</ExternalTaskPojo>
1488	1460	<ExternalTaskPojo>
1489		- <option name="description" value="Prepare com.android.support:preference-v7:25.3.1" />
1490	1461	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1491		- <option name="name" value="prepareComAndroidSupportPreferenceV72531Library" />
	1462	+ <option name="name" value="transformDexArchiveWithDexMergerForDebugAndroidTest" />
1492	1463	</ExternalTaskPojo>
1493	1464	<ExternalTaskPojo>
1494	1465	<option name="description" value="Displays the dependent components of components in project ':app'. [incubating]" />

		@@ -1531,10 +1502,6 @@
1531	1502	</ExternalTaskPojo>
1532	1503	<ExternalTaskPojo>
1533	1504	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1534		- <option name="name" value="prepareDebugUnitTestDependencies" />
1535		- </ExternalTaskPojo>
1536		- <ExternalTaskPojo>
1537		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1538	1505	<option name="name" value="generateReleaseResources" />
1539	1506	</ExternalTaskPojo>
1540	1507	<ExternalTaskPojo>

		@@ -1543,6 +1510,10 @@
1543	1510	<option name="name" value="lintVitalRelease" />
1544	1511	</ExternalTaskPojo>
1545	1512	<ExternalTaskPojo>
	1513	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1514	+ <option name="name" value="platformAttrExtractor" />
	1515	+ </ExternalTaskPojo>
	1516	+ <ExternalTaskPojo>
1546	1517	<option name="description" value="Uninstalls the Debug build." />
1547	1518	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1548	1519	<option name="name" value="uninstallDebug" />

		@@ -1561,6 +1532,10 @@
1561	1532	<option name="name" value="mergeDebugAndroidTestShaders" />
1562	1533	</ExternalTaskPojo>
1563	1534	<ExternalTaskPojo>
	1535	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1536	+ <option name="name" value="bundleAppClassesDebugAndroidTest" />
	1537	+ </ExternalTaskPojo>
	1538	+ <ExternalTaskPojo>
1564	1539	<option name="description" value="Deletes the build directory." />
1565	1540	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1566	1541	<option name="name" value="clean" />

		@@ -1574,6 +1549,10 @@
1574	1549	<option name="name" value="generateDebugBuildConfig" />
1575	1550	</ExternalTaskPojo>
1576	1551	<ExternalTaskPojo>
	1552	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1553	+ <option name="name" value="transformDexArchiveWithExternalLibsDexMergerForDebug" />
	1554	+ </ExternalTaskPojo>
	1555	+ <ExternalTaskPojo>
1577	1556	<option name="description" value="Assembles and tests this project." />
1578	1557	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1579	1558	<option name="name" value="build" />

		@@ -1585,6 +1564,10 @@
1585	1564	</ExternalTaskPojo>
1586	1565	<ExternalTaskPojo>
1587	1566	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1567	+ <option name="name" value="resolveConfigAttr" />
	1568	+ </ExternalTaskPojo>
	1569	+ <ExternalTaskPojo>
	1570	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1588	1571	<option name="name" value="compileDebugAndroidTestRenderscript" />
1589	1572	</ExternalTaskPojo>
1590	1573	<ExternalTaskPojo>

		@@ -1597,6 +1580,10 @@
1597	1580	</ExternalTaskPojo>
1598	1581	<ExternalTaskPojo>
1599	1582	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
	1583	+ <option name="name" value="writeReleaseApplicationId" />
	1584	+ </ExternalTaskPojo>
	1585	+ <ExternalTaskPojo>
	1586	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1600	1587	<option name="name" value="packageDebugAndroidTest" />
1601	1588	</ExternalTaskPojo>
1602	1589	<ExternalTaskPojo>

		@@ -1615,10 +1602,6 @@
1615	1602	<value>
1616	1603	<list>
1617	1604	<ExternalTaskPojo>
1618		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1619		- <option name="name" value="mergeDebugProguardFiles" />
1620		- </ExternalTaskPojo>
1621		- <ExternalTaskPojo>
1622	1605	<option name="description" value="Displays the sub-projects of project ':openCVLibrary320'." />
1623	1606	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1624	1607	<option name="name" value="projects" />

		@@ -1629,6 +1612,10 @@
1629	1612	</ExternalTaskPojo>
1630	1613	<ExternalTaskPojo>
1631	1614	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1615	+ <option name="name" value="mergeReleaseConsumerProguardFiles" />
	1616	+ </ExternalTaskPojo>
	1617	+ <ExternalTaskPojo>
	1618	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1632	1619	<option name="name" value="validateSigningDebugAndroidTest" />
1633	1620	</ExternalTaskPojo>
1634	1621	<ExternalTaskPojo>

		@@ -1641,7 +1628,7 @@
1641	1628	</ExternalTaskPojo>
1642	1629	<ExternalTaskPojo>
1643	1630	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1644		- <option name="name" value="prepareDebugDependencies" />
	1631	+ <option name="name" value="transformClassesAndResourcesWithPrepareIntermediateJarsForRelease" />
1645	1632	</ExternalTaskPojo>
1646	1633	<ExternalTaskPojo>
1647	1634	<option name="description" value="Assembles a bundle containing the library in debug." />

		@@ -1650,10 +1637,6 @@
1650	1637	</ExternalTaskPojo>
1651	1638	<ExternalTaskPojo>
1652	1639	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1653		- <option name="name" value="copyDebugLint" />
1654		- </ExternalTaskPojo>
1655		- <ExternalTaskPojo>
1656		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1657	1640	<option name="name" value="processReleaseJavaRes" />
1658	1641	</ExternalTaskPojo>
1659	1642	<ExternalTaskPojo>

		@@ -1695,20 +1678,20 @@
1695	1678	</ExternalTaskPojo>
1696	1679	<ExternalTaskPojo>
1697	1680	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1698		- <option name="name" value="packageReleaseRenderscript" />
	1681	+ <option name="name" value="transformClassesAndResourcesWithPrepareIntermediateJarsForDebug" />
1699	1682	</ExternalTaskPojo>
1700	1683	<ExternalTaskPojo>
1701	1684	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1702		- <option name="name" value="mergeReleaseProguardFiles" />
	1685	+ <option name="name" value="packageReleaseRenderscript" />
1703	1686	</ExternalTaskPojo>
1704	1687	<ExternalTaskPojo>
	1688	+ <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
1705	1689	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1706		- <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
	1690	+ <option name="name" value="deviceCheck" />
1707	1691	</ExternalTaskPojo>
1708	1692	<ExternalTaskPojo>
1709		- <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
1710	1693	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1711		- <option name="name" value="deviceCheck" />
	1694	+ <option name="name" value="transformNativeLibsWithIntermediateJniLibsForRelease" />
1712	1695	</ExternalTaskPojo>
1713	1696	<ExternalTaskPojo>
1714	1697	<option name="description" value="Displays all dependencies declared in project ':openCVLibrary320'." />

		@@ -1810,7 +1793,12 @@
1810	1793	<option name="name" value="preDebugAndroidTestBuild" />
1811	1794	</ExternalTaskPojo>
1812	1795	<ExternalTaskPojo>
	1796	+ <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
1813	1797	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1798	+ <option name="name" value="extractDebugAnnotations" />
	1799	+ </ExternalTaskPojo>
	1800	+ <ExternalTaskPojo>
	1801	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1814	1802	<option name="name" value="processDebugAndroidTestJavaRes" />
1815	1803	</ExternalTaskPojo>
1816	1804	<ExternalTaskPojo>

		@@ -1831,15 +1819,15 @@
1831	1819	</ExternalTaskPojo>
1832	1820	<ExternalTaskPojo>
1833	1821	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1834		- <option name="name" value="generateDebugAndroidTestSources" />
	1822	+ <option name="name" value="mergeReleaseResources" />
1835	1823	</ExternalTaskPojo>
1836	1824	<ExternalTaskPojo>
1837	1825	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1838		- <option name="name" value="prepareDebugAndroidTestDependencies" />
	1826	+ <option name="name" value="transformNativeLibsWithIntermediateJniLibsForDebug" />
1839	1827	</ExternalTaskPojo>
1840	1828	<ExternalTaskPojo>
1841	1829	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1842		- <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
	1830	+ <option name="name" value="generateDebugAndroidTestSources" />
1843	1831	</ExternalTaskPojo>
1844	1832	<ExternalTaskPojo>
1845	1833	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />

		@@ -1855,6 +1843,10 @@
1855	1843	</ExternalTaskPojo>
1856	1844	<ExternalTaskPojo>
1857	1845	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1846	+ <option name="name" value="verifyReleaseResources" />
	1847	+ </ExternalTaskPojo>
	1848	+ <ExternalTaskPojo>
	1849	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1858	1850	<option name="name" value="packageDebugResources" />
1859	1851	</ExternalTaskPojo>
1860	1852	<ExternalTaskPojo>

		@@ -1871,7 +1863,7 @@
1871	1863	</ExternalTaskPojo>
1872	1864	<ExternalTaskPojo>
1873	1865	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1874		- <option name="name" value="prepareReleaseDependencies" />
	1866	+ <option name="name" value="prepareLintJar" />
1875	1867	</ExternalTaskPojo>
1876	1868	<ExternalTaskPojo>
1877	1869	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />

		@@ -1906,10 +1898,6 @@
1906	1898	</ExternalTaskPojo>
1907	1899	<ExternalTaskPojo>
1908	1900	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1909		- <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
1910		- </ExternalTaskPojo>
1911		- <ExternalTaskPojo>
1912		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1913	1901	<option name="name" value="preReleaseBuild" />
1914	1902	</ExternalTaskPojo>
1915	1903	<ExternalTaskPojo>

		@@ -1919,13 +1907,9 @@
1919	1907	</ExternalTaskPojo>
1920	1908	<ExternalTaskPojo>
1921	1909	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1922		- <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
	1910	+ <option name="name" value="createFullJarDebug" />
1923	1911	</ExternalTaskPojo>
1924	1912	<ExternalTaskPojo>
1925		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1926		- <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
1927		- </ExternalTaskPojo>
1928		- <ExternalTaskPojo>
1929	1913	<option name="description" value="Displays a help message." />
1930	1914	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1931	1915	<option name="name" value="help" />

		@@ -1941,6 +1925,10 @@
1941	1925	</ExternalTaskPojo>
1942	1926	<ExternalTaskPojo>
1943	1927	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1928	+ <option name="name" value="transformClassesWithDexBuilderForDebugAndroidTest" />
	1929	+ </ExternalTaskPojo>
	1930	+ <ExternalTaskPojo>
	1931	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1944	1932	<option name="name" value="mergeDebugAssets" />
1945	1933	</ExternalTaskPojo>
1946	1934	<ExternalTaskPojo>

		@@ -1980,11 +1968,20 @@
1980	1968	<option name="name" value="processDebugAndroidTestResources" />
1981	1969	</ExternalTaskPojo>
1982	1970	<ExternalTaskPojo>
	1971	+ <option name="description" value="Extracts Android annotations for the release variant into the archive file" />
1983	1972	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1973	+ <option name="name" value="extractReleaseAnnotations" />
	1974	+ </ExternalTaskPojo>
	1975	+ <ExternalTaskPojo>
	1976	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1984	1977	<option name="name" value="compileDebugAidl" />
1985	1978	</ExternalTaskPojo>
1986	1979	<ExternalTaskPojo>
1987	1980	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	1981	+ <option name="name" value="mergeDebugResources" />
	1982	+ </ExternalTaskPojo>
	1983	+ <ExternalTaskPojo>
	1984	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
1988	1985	<option name="name" value="preDebugUnitTestBuild" />
1989	1986	</ExternalTaskPojo>
1990	1987	<ExternalTaskPojo>

		@@ -2022,6 +2019,10 @@
2022	2019	</ExternalTaskPojo>
2023	2020	<ExternalTaskPojo>
2024	2021	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	2022	+ <option name="name" value="transformDexArchiveWithExternalLibsDexMergerForDebugAndroidTest" />
	2023	+ </ExternalTaskPojo>
	2024	+ <ExternalTaskPojo>
	2025	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2025	2026	<option name="name" value="generateDebugSources" />
2026	2027	</ExternalTaskPojo>
2027	2028	<ExternalTaskPojo>

		@@ -2034,19 +2035,15 @@
2034	2035	</ExternalTaskPojo>
2035	2036	<ExternalTaskPojo>
2036	2037	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2037		- <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
2038		- </ExternalTaskPojo>
2039		- <ExternalTaskPojo>
2040		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2041	2038	<option name="name" value="assembleDebugAndroidTest" />
2042	2039	</ExternalTaskPojo>
2043	2040	<ExternalTaskPojo>
2044	2041	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2045		- <option name="name" value="copyReleaseLint" />
	2042	+ <option name="name" value="processDebugJavaRes" />
2046	2043	</ExternalTaskPojo>
2047	2044	<ExternalTaskPojo>
2048	2045	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2049		- <option name="name" value="processDebugJavaRes" />
	2046	+ <option name="name" value="consumeConfigAttr" />
2050	2047	</ExternalTaskPojo>
2051	2048	<ExternalTaskPojo>
2052	2049	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />

		@@ -2061,10 +2058,6 @@
2061	2058	<option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
2062	2059	</ExternalTaskPojo>
2063	2060	<ExternalTaskPojo>
2064		- <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2065		- <option name="name" value="prepareReleaseUnitTestDependencies" />
2066		- </ExternalTaskPojo>
2067		- <ExternalTaskPojo>
2068	2061	<option name="description" value="Run unit tests for all variants." />
2069	2062	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2070	2063	<option name="name" value="test" />

		@@ -2151,6 +2144,10 @@
2151	2144	<option name="name" value="generateDebugAssets" />
2152	2145	</ExternalTaskPojo>
2153	2146	<ExternalTaskPojo>
	2147	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	2148	+ <option name="name" value="transformDexArchiveWithDexMergerForDebugAndroidTest" />
	2149	+ </ExternalTaskPojo>
	2150	+ <ExternalTaskPojo>
2154	2151	<option name="description" value="Displays the dependent components of components in project ':openCVLibrary320'. [incubating]" />
2155	2152	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2156	2153	<option name="name" value="dependentComponents" />

		@@ -2183,6 +2180,10 @@
2183	2180	</ExternalTaskPojo>
2184	2181	<ExternalTaskPojo>
2185	2182	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	2183	+ <option name="name" value="createFullJarRelease" />
	2184	+ </ExternalTaskPojo>
	2185	+ <ExternalTaskPojo>
	2186	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2186	2187	<option name="name" value="compileDebugRenderscript" />
2187	2188	</ExternalTaskPojo>
2188	2189	<ExternalTaskPojo>

		@@ -2195,11 +2196,11 @@
2195	2196	</ExternalTaskPojo>
2196	2197	<ExternalTaskPojo>
2197	2198	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2198		- <option name="name" value="prepareDebugUnitTestDependencies" />
	2199	+ <option name="name" value="generateReleaseResources" />
2199	2200	</ExternalTaskPojo>
2200	2201	<ExternalTaskPojo>
2201	2202	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2202		- <option name="name" value="generateReleaseResources" />
	2203	+ <option name="name" value="platformAttrExtractor" />
2203	2204	</ExternalTaskPojo>
2204	2205	<ExternalTaskPojo>
2205	2206	<option name="description" value="Displays the signing info for each variant." />

		@@ -2239,6 +2240,14 @@
2239	2240	</ExternalTaskPojo>
2240	2241	<ExternalTaskPojo>
2241	2242	<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	2243	+ <option name="name" value="resolveConfigAttr" />
	2244	+ </ExternalTaskPojo>
	2245	+ <ExternalTaskPojo>
	2246	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
	2247	+ <option name="name" value="mergeDebugConsumerProguardFiles" />
	2248	+ </ExternalTaskPojo>
	2249	+ <ExternalTaskPojo>
	2250	+ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/openCVLibrary320" />
2242	2251	<option name="name" value="compileDebugAndroidTestRenderscript" />
2243	2252	</ExternalTaskPojo>
2244	2253	<ExternalTaskPojo>

		@@ -2286,87 +2295,73 @@
2286	2295	<ExternalModuleBuildClasspathPojo>
2287	2296	<option name="entries">
2288	2297	<list>
2289		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3-sources.jar" />
2290		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3.jar" />
2291		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3-sources.jar" />
2292		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3.jar" />
2293		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3-sources.jar" />
2294		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3.jar" />
2295		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3-sources.jar" />
2296		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3.jar" />
	2298	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.jar" />
	2299	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.jar" />
	2300	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/3.0.0/builder-3.0.0.jar" />
	2301	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/26.0.0/lint-26.0.0.jar" />
	2302	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.jar" />
	2303	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.jar" />
	2304	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.jar" />
	2305	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.jar" />
2297	2306	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
2298		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3-sources.jar" />
2299		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3.jar" />
2300		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3-sources.jar" />
2301		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3.jar" />
2302		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
2303		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
2304		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
2305		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
2306		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
2307		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
	2307	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.1/asm-5.1.jar" />
	2308	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.jar" />
	2309	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar" />
	2310	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar" />
	2311	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar" />
	2312	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.jar" />
2308	2313	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
	2314	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.jar" />
2309	2315	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
2310		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3-sources.jar" />
2311		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3.jar" />
2312		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3-sources.jar" />
2313		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3.jar" />
2314		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3-sources.jar" />
2315		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3.jar" />
2316		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3-sources.jar" />
2317		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3.jar" />
2318		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3-sources.jar" />
2319		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3.jar" />
2320		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3-sources.jar" />
2321		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3.jar" />
2322		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3-sources.jar" />
2323		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3.jar" />
2324		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
2325		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
2326		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3-sources.jar" />
2327		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3.jar" />
2328		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3-sources.jar" />
2329		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3.jar" />
2330		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3-sources.jar" />
2331		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3.jar" />
	2316	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.jar" />
	2317	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.jar" />
	2318	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.jar" />
	2319	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.jar" />
	2320	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/26.0.0/common-26.0.0.jar" />
	2321	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.jar" />
	2322	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.jar" />
	2323	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.jar" />
	2324	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.jar" />
	2325	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.jar" />
	2326	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.jar" />
2332	2327	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
2333		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
2334		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
2335		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
2336		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3-sources.jar" />
2337		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3.jar" />
	2328	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar" />
	2329	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar" />
	2330	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar" />
	2331	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar" />
	2332	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar" />
	2333	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.jar" />
2338	2334	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
2339		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
2340		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3-sources.jar" />
2341		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3.jar" />
	2335	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/22.0/guava-22.0.jar" />
	2336	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.jar" />
2342	2337	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
2343	2338	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
2344	2339	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
2345		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3-sources.jar" />
2346		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3.jar" />
2347		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
2348		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
2349		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3-sources.jar" />
2350		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3.jar" />
2351		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3-sources.jar" />
2352		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3.jar" />
2353		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3-sources.jar" />
2354		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3.jar" />
2355		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
2356		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
2357		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
	2340	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/26.0.0/annotations-26.0.0.jar" />
	2341	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.jar" />
	2342	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.jar" />
	2343	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.jar" />
	2344	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/26.0.0/repository-26.0.0.jar" />
	2345	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.3/gson-2.3.jar" />
	2346	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar" />
	2347	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.jar" />
2358	2348	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
2359	2349	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
2360		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3-sources.jar" />
2361		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3.jar" />
2362		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
	2350	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.jar" />
2363	2351	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
2364	2352	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
2365		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
	2353	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.2.5/httpcore-4.2.5.jar" />
2366	2354	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
2367		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
2368		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
	2355	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" />
	2356	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.jar" />
2369	2357	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
	2358	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.jar" />
	2359	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
	2360	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar" />
	2361	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
	2362	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar" />
	2363	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
	2364	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
2370	2365	</list>
2371	2366	</option>
2372	2367	<option name="path" value="$PROJECT_DIR$" />

		@@ -2378,87 +2373,73 @@
2378	2373	<ExternalModuleBuildClasspathPojo>
2379	2374	<option name="entries">
2380	2375	<list>
2381		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3-sources.jar" />
2382		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3.jar" />
2383		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3-sources.jar" />
2384		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3.jar" />
2385		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3-sources.jar" />
2386		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3.jar" />
2387		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3-sources.jar" />
2388		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3.jar" />
	2376	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.jar" />
	2377	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.jar" />
	2378	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/3.0.0/builder-3.0.0.jar" />
	2379	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/26.0.0/lint-26.0.0.jar" />
	2380	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.jar" />
	2381	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.jar" />
	2382	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.jar" />
	2383	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.jar" />
2389	2384	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
2390		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3-sources.jar" />
2391		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3.jar" />
2392		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3-sources.jar" />
2393		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3.jar" />
2394		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
2395		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
2396		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
2397		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
2398		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
2399		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
	2385	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.1/asm-5.1.jar" />
	2386	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.jar" />
	2387	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar" />
	2388	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar" />
	2389	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar" />
	2390	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.jar" />
2400	2391	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
	2392	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.jar" />
2401	2393	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
2402		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3-sources.jar" />
2403		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3.jar" />
2404		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3-sources.jar" />
2405		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3.jar" />
2406		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3-sources.jar" />
2407		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3.jar" />
2408		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3-sources.jar" />
2409		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3.jar" />
2410		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3-sources.jar" />
2411		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3.jar" />
2412		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3-sources.jar" />
2413		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3.jar" />
2414		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3-sources.jar" />
2415		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3.jar" />
2416		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
2417		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
2418		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3-sources.jar" />
2419		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3.jar" />
2420		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3-sources.jar" />
2421		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3.jar" />
2422		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3-sources.jar" />
2423		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3.jar" />
	2394	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.jar" />
	2395	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.jar" />
	2396	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.jar" />
	2397	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.jar" />
	2398	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/26.0.0/common-26.0.0.jar" />
	2399	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.jar" />
	2400	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.jar" />
	2401	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.jar" />
	2402	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.jar" />
	2403	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.jar" />
	2404	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.jar" />
2424	2405	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
2425		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
2426		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
2427		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
2428		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3-sources.jar" />
2429		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3.jar" />
	2406	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar" />
	2407	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar" />
	2408	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar" />
	2409	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar" />
	2410	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar" />
	2411	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.jar" />
2430	2412	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
2431		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
2432		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3-sources.jar" />
2433		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3.jar" />
	2413	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/22.0/guava-22.0.jar" />
	2414	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.jar" />
2434	2415	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
2435	2416	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
2436	2417	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
2437		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3-sources.jar" />
2438		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3.jar" />
2439		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
2440		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
2441		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3-sources.jar" />
2442		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3.jar" />
2443		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3-sources.jar" />
2444		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3.jar" />
2445		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3-sources.jar" />
2446		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3.jar" />
2447		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
2448		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
2449		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
	2418	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/26.0.0/annotations-26.0.0.jar" />
	2419	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.jar" />
	2420	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.jar" />
	2421	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.jar" />
	2422	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/26.0.0/repository-26.0.0.jar" />
	2423	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.3/gson-2.3.jar" />
	2424	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar" />
	2425	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.jar" />
2450	2426	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
2451	2427	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
2452		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3-sources.jar" />
2453		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3.jar" />
2454		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
	2428	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.jar" />
2455	2429	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
2456	2430	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
2457		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
	2431	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.2.5/httpcore-4.2.5.jar" />
2458	2432	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
2459		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
2460		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
	2433	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" />
	2434	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.jar" />
2461	2435	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
	2436	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.jar" />
	2437	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
	2438	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar" />
	2439	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
	2440	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar" />
	2441	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
	2442	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
2462	2443	</list>
2463	2444	</option>
2464	2445	<option name="path" value="$PROJECT_DIR$/app" />

		@@ -2644,87 +2625,73 @@
2644	2625	<ExternalModuleBuildClasspathPojo>
2645	2626	<option name="entries">
2646	2627	<list>
2647		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3-sources.jar" />
2648		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.3/gradle-2.3.3.jar" />
2649		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3-sources.jar" />
2650		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.3/gradle-core-2.3.3.jar" />
2651		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3-sources.jar" />
2652		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.3/builder-2.3.3.jar" />
2653		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3-sources.jar" />
2654		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.3/lint-25.3.3.jar" />
	2628	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.jar" />
	2629	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.jar" />
	2630	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/3.0.0/builder-3.0.0.jar" />
	2631	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/26.0.0/lint-26.0.0.jar" />
	2632	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.jar" />
	2633	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.jar" />
	2634	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.jar" />
	2635	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.jar" />
2655	2636	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
2656		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3-sources.jar" />
2657		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.3/gradle-api-2.3.3.jar" />
2658		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3-sources.jar" />
2659		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.3/compilerCommon-2.3.3.jar" />
2660		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
2661		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
2662		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
2663		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
2664		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
2665		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
	2637	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.1/asm-5.1.jar" />
	2638	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.jar" />
	2639	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar" />
	2640	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar" />
	2641	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar" />
	2642	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.jar" />
2666	2643	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
	2644	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.jar" />
2667	2645	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
2668		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3-sources.jar" />
2669		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.3/builder-model-2.3.3.jar" />
2670		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3-sources.jar" />
2671		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.3/builder-test-api-2.3.3.jar" />
2672		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3-sources.jar" />
2673		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.3/sdklib-25.3.3.jar" />
2674		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3-sources.jar" />
2675		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.3/sdk-common-25.3.3.jar" />
2676		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3-sources.jar" />
2677		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.3/common-25.3.3.jar" />
2678		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3-sources.jar" />
2679		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.3/manifest-merger-25.3.3.jar" />
2680		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3-sources.jar" />
2681		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.3/ddmlib-25.3.3.jar" />
2682		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
2683		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
2684		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3-sources.jar" />
2685		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.3/protos-25.3.3.jar" />
2686		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3-sources.jar" />
2687		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.3/shared-25.3.3.jar" />
2688		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3-sources.jar" />
2689		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.3/tracker-25.3.3.jar" />
	2646	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.jar" />
	2647	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.jar" />
	2648	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.jar" />
	2649	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.jar" />
	2650	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/26.0.0/common-26.0.0.jar" />
	2651	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.jar" />
	2652	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.jar" />
	2653	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.jar" />
	2654	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.jar" />
	2655	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.jar" />
	2656	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.jar" />
2690	2657	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
2691		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
2692		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
2693		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
2694		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3-sources.jar" />
2695		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.3/lint-checks-25.3.3.jar" />
	2658	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar" />
	2659	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar" />
	2660	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar" />
	2661	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar" />
	2662	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar" />
	2663	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.jar" />
2696	2664	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
2697		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
2698		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3-sources.jar" />
2699		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.3/baseLibrary-2.3.3.jar" />
	2665	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/22.0/guava-22.0.jar" />
	2666	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.jar" />
2700	2667	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
2701	2668	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
2702	2669	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
2703		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3-sources.jar" />
2704		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.3/annotations-25.3.3.jar" />
2705		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
2706		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
2707		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3-sources.jar" />
2708		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.3/layoutlib-api-25.3.3.jar" />
2709		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3-sources.jar" />
2710		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.3/dvlib-25.3.3.jar" />
2711		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3-sources.jar" />
2712		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.3/repository-25.3.3.jar" />
2713		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
2714		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
2715		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
	2670	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/26.0.0/annotations-26.0.0.jar" />
	2671	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.jar" />
	2672	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.jar" />
	2673	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.jar" />
	2674	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/26.0.0/repository-26.0.0.jar" />
	2675	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.3/gson-2.3.jar" />
	2676	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar" />
	2677	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.jar" />
2716	2678	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
2717	2679	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
2718		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3-sources.jar" />
2719		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.3/lint-api-25.3.3.jar" />
2720		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
	2680	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.jar" />
2721	2681	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
2722	2682	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
2723		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
	2683	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.2.5/httpcore-4.2.5.jar" />
2724	2684	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
2725		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
2726		- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
	2685	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" />
	2686	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.jar" />
2727	2687	<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
	2688	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.jar" />
	2689	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
	2690	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar" />
	2691	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
	2692	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar" />
	2693	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
	2694	+ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
2728	2695	</list>
2729	2696	</option>
2730	2697	<option name="path" value="$PROJECT_DIR$/openCVLibrary320" />

		@@ -2752,7 +2719,6 @@
2752	2719	<component name="IdeDocumentHistory">
2753	2720	<option name="CHANGED_PATHS">
2754	2721	<list>
2755		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/AutoFocusControl.java" />
2756	2722	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/MovieRecordingControl.java" />
2757	2723	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/SingleShotControl.java" />
2758	2724	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/SequentialShotControl.java" />

		@@ -2767,7 +2733,6 @@
2767	2733	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IZoomLensHolder.java" />
2768	2734	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/PanelDrawer.java" />
2769	2735	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java" />
2770		- <option value="$PROJECT_DIR$/openCVLibrary320/build.gradle" />
2771	2736	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
2772	2737	<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2773	2738	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConnectingFragment.java" />

		@@ -2799,28 +2764,20 @@
2799	2764	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java" />
2800	2765	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
2801	2766	<option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
	2767	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/StoreImage.java" />
	2768	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java" />
2802	2769	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java" />
2803		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/StoreImage.java" />
	2770	+ <option value="$PROJECT_DIR$/build.gradle" />
2804	2771	<option value="$PROJECT_DIR$/app/build.gradle" />
2805		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java" />
	2772	+ <option value="$PROJECT_DIR$/openCVLibrary320/build.gradle" />
2806	2773	</list>
2807	2774	</option>
2808	2775	</component>
2809	2776	<component name="ProjectFrameBounds">
2810	2777	<option name="x" value="56" />
2811		- <option name="width" value="2505" />
2812		- <option name="height" value="1435" />
	2778	+ <option name="width" value="2504" />
	2779	+ <option name="height" value="1440" />
2813	2780	</component>
2814		- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
2815		- <OptionsSetting value="true" id="Add" />
2816		- <OptionsSetting value="true" id="Remove" />
2817		- <OptionsSetting value="true" id="Checkout" />
2818		- <OptionsSetting value="true" id="Update" />
2819		- <OptionsSetting value="true" id="Status" />
2820		- <OptionsSetting value="true" id="Edit" />
2821		- <ConfirmationsSetting value="0" id="Add" />
2822		- <ConfirmationsSetting value="0" id="Remove" />
2823		- </component>
2824	2781	<component name="ProjectView">
2825	2782	<navigator currentView="ProjectPane" proportions="" version="1">
2826	2783	<flattenPackages PackagesPane="true" ProjectPane="false" />

		@@ -2836,9 +2793,6 @@
2836	2793	<foldersAlwaysOnTop value="true" />
2837	2794	</navigator>
2838	2795	<panes>
2839		- <pane id="Scratches">
2840		- <subPane />
2841		- </pane>
2842	2796	<pane id="AndroidView">
2843	2797	<subPane>
2844	2798	<PATH>

		@@ -2931,6 +2885,7 @@
2931	2885	</PATH>
2932	2886	</subPane>
2933	2887	</pane>
	2888	+ <pane id="Scratches" />
2934	2889	<pane id="ProjectPane">
2935	2890	<subPane>
2936	2891	<PATH>

		@@ -2938,14 +2893,8 @@
2938	2893	<option name="myItemId" value="AirA01b" />
2939	2894	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2940	2895	</PATH_ELEMENT>
2941		- </PATH>
2942		- <PATH>
2943	2896	<PATH_ELEMENT>
2944	2897	<option name="myItemId" value="AirA01b" />
2945		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2946		- </PATH_ELEMENT>
2947		- <PATH_ELEMENT>
2948		- <option name="myItemId" value="AirA01b" />
2949	2898	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2950	2899	</PATH_ELEMENT>
2951	2900	</PATH>

		@@ -2959,7 +2908,7 @@
2959	2908	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2960	2909	</PATH_ELEMENT>
2961	2910	<PATH_ELEMENT>
2962		- <option name="myItemId" value="gradle" />
	2911	+ <option name="myItemId" value="openCVLibrary320" />
2963	2912	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2964	2913	</PATH_ELEMENT>
2965	2914	</PATH>

		@@ -2973,7 +2922,7 @@
2973	2922	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2974	2923	</PATH_ELEMENT>
2975	2924	<PATH_ELEMENT>
2976		- <option name="myItemId" value="app" />
	2925	+ <option name="myItemId" value="gradle" />
2977	2926	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2978	2927	</PATH_ELEMENT>
2979	2928	</PATH>

		@@ -2990,186 +2939,9 @@
2990	2939	<option name="myItemId" value="app" />
2991	2940	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2992	2941	</PATH_ELEMENT>
2993		- <PATH_ELEMENT>
2994		- <option name="myItemId" value="src" />
2995		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2996		- </PATH_ELEMENT>
2997		- <PATH_ELEMENT>
2998		- <option name="myItemId" value="main" />
2999		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3000		- </PATH_ELEMENT>
3001	2942	</PATH>
3002		- <PATH>
3003		- <PATH_ELEMENT>
3004		- <option name="myItemId" value="AirA01b" />
3005		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3006		- </PATH_ELEMENT>
3007		- <PATH_ELEMENT>
3008		- <option name="myItemId" value="AirA01b" />
3009		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3010		- </PATH_ELEMENT>
3011		- <PATH_ELEMENT>
3012		- <option name="myItemId" value="app" />
3013		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3014		- </PATH_ELEMENT>
3015		- <PATH_ELEMENT>
3016		- <option name="myItemId" value="src" />
3017		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3018		- </PATH_ELEMENT>
3019		- <PATH_ELEMENT>
3020		- <option name="myItemId" value="main" />
3021		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3022		- </PATH_ELEMENT>
3023		- <PATH_ELEMENT>
3024		- <option name="myItemId" value="java" />
3025		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3026		- </PATH_ELEMENT>
3027		- <PATH_ELEMENT>
3028		- <option name="myItemId" value="aira01b" />
3029		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3030		- </PATH_ELEMENT>
3031		- </PATH>
3032		- <PATH>
3033		- <PATH_ELEMENT>
3034		- <option name="myItemId" value="AirA01b" />
3035		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3036		- </PATH_ELEMENT>
3037		- <PATH_ELEMENT>
3038		- <option name="myItemId" value="AirA01b" />
3039		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3040		- </PATH_ELEMENT>
3041		- <PATH_ELEMENT>
3042		- <option name="myItemId" value="app" />
3043		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3044		- </PATH_ELEMENT>
3045		- <PATH_ELEMENT>
3046		- <option name="myItemId" value="src" />
3047		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3048		- </PATH_ELEMENT>
3049		- <PATH_ELEMENT>
3050		- <option name="myItemId" value="main" />
3051		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3052		- </PATH_ELEMENT>
3053		- <PATH_ELEMENT>
3054		- <option name="myItemId" value="java" />
3055		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3056		- </PATH_ELEMENT>
3057		- <PATH_ELEMENT>
3058		- <option name="myItemId" value="aira01b" />
3059		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3060		- </PATH_ELEMENT>
3061		- <PATH_ELEMENT>
3062		- <option name="myItemId" value="olycamerawrapper" />
3063		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3064		- </PATH_ELEMENT>
3065		- </PATH>
3066		- <PATH>
3067		- <PATH_ELEMENT>
3068		- <option name="myItemId" value="AirA01b" />
3069		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3070		- </PATH_ELEMENT>
3071		- <PATH_ELEMENT>
3072		- <option name="myItemId" value="AirA01b" />
3073		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3074		- </PATH_ELEMENT>
3075		- <PATH_ELEMENT>
3076		- <option name="myItemId" value="app" />
3077		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3078		- </PATH_ELEMENT>
3079		- <PATH_ELEMENT>
3080		- <option name="myItemId" value="src" />
3081		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3082		- </PATH_ELEMENT>
3083		- <PATH_ELEMENT>
3084		- <option name="myItemId" value="main" />
3085		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3086		- </PATH_ELEMENT>
3087		- <PATH_ELEMENT>
3088		- <option name="myItemId" value="java" />
3089		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3090		- </PATH_ELEMENT>
3091		- <PATH_ELEMENT>
3092		- <option name="myItemId" value="aira01b" />
3093		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3094		- </PATH_ELEMENT>
3095		- <PATH_ELEMENT>
3096		- <option name="myItemId" value="olycameraproperty" />
3097		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3098		- </PATH_ELEMENT>
3099		- </PATH>
3100		- <PATH>
3101		- <PATH_ELEMENT>
3102		- <option name="myItemId" value="AirA01b" />
3103		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3104		- </PATH_ELEMENT>
3105		- <PATH_ELEMENT>
3106		- <option name="myItemId" value="AirA01b" />
3107		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3108		- </PATH_ELEMENT>
3109		- <PATH_ELEMENT>
3110		- <option name="myItemId" value="app" />
3111		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3112		- </PATH_ELEMENT>
3113		- <PATH_ELEMENT>
3114		- <option name="myItemId" value="src" />
3115		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3116		- </PATH_ELEMENT>
3117		- <PATH_ELEMENT>
3118		- <option name="myItemId" value="main" />
3119		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3120		- </PATH_ELEMENT>
3121		- <PATH_ELEMENT>
3122		- <option name="myItemId" value="java" />
3123		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3124		- </PATH_ELEMENT>
3125		- <PATH_ELEMENT>
3126		- <option name="myItemId" value="aira01b" />
3127		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3128		- </PATH_ELEMENT>
3129		- <PATH_ELEMENT>
3130		- <option name="myItemId" value="myolycameraprops" />
3131		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3132		- </PATH_ELEMENT>
3133		- </PATH>
3134		- <PATH>
3135		- <PATH_ELEMENT>
3136		- <option name="myItemId" value="AirA01b" />
3137		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3138		- </PATH_ELEMENT>
3139		- <PATH_ELEMENT>
3140		- <option name="myItemId" value="AirA01b" />
3141		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3142		- </PATH_ELEMENT>
3143		- <PATH_ELEMENT>
3144		- <option name="myItemId" value="app" />
3145		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3146		- </PATH_ELEMENT>
3147		- <PATH_ELEMENT>
3148		- <option name="myItemId" value="src" />
3149		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3150		- </PATH_ELEMENT>
3151		- <PATH_ELEMENT>
3152		- <option name="myItemId" value="main" />
3153		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3154		- </PATH_ELEMENT>
3155		- <PATH_ELEMENT>
3156		- <option name="myItemId" value="java" />
3157		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3158		- </PATH_ELEMENT>
3159		- <PATH_ELEMENT>
3160		- <option name="myItemId" value="aira01b" />
3161		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3162		- </PATH_ELEMENT>
3163		- <PATH_ELEMENT>
3164		- <option name="myItemId" value="liveview" />
3165		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3166		- </PATH_ELEMENT>
3167		- </PATH>
3168	2943	</subPane>
3169	2944	</pane>
3170		- <pane id="PackagesPane">
3171		- <subPane />
3172		- </pane>
3173	2945	<pane id="Scope">
3174	2946	<subPane subId="Project Files">
3175	2947	<PATH>

		@@ -3190,6 +2962,7 @@
3190	2962	</PATH>
3191	2963	</subPane>
3192	2964	</pane>
	2965	+ <pane id="PackagesPane" />
3193	2966	</panes>
3194	2967	</component>
3195	2968	<component name="PropertiesComponent">

		@@ -3234,6 +3007,18 @@
3234	3007	<recent name="C:\Users\MRSa\AndroidStudioProjects\AirA01b\app\src\main\res\menu" />
3235	3008	</key>
3236	3009	</component>
	3010	+ <component name="RunDashboard">
	3011	+ <option name="ruleStates">
	3012	+ <list>
	3013	+ <RuleState>
	3014	+ <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
	3015	+ </RuleState>
	3016	+ <RuleState>
	3017	+ <option name="name" value="StatusDashboardGroupingRule" />
	3018	+ </RuleState>
	3019	+ </list>
	3020	+ </option>
	3021	+ </component>
3237	3022	<component name="RunManager" selected="Android App.app">
3238	3023	<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
3239	3024	<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

		@@ -3266,7 +3051,6 @@
3266	3051	<option name="PM_INSTALL_OPTIONS" value="" />
3267	3052	<option name="ACTIVITY_EXTRA_FLAGS" value="" />
3268	3053	<option name="MODE" value="default_activity" />
3269		- <option name="PREFERRED_AVD" value="" />
3270	3054	<option name="CLEAR_LOGCAT" value="false" />
3271	3055	<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
3272	3056	<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />

		@@ -3300,13 +3084,14 @@
3300	3084	<option name="SHOW_OPTIMIZED_WARNING" value="true" />
3301	3085	</Native>
3302	3086	<Profilers>
3303		- <option name="ENABLE_ADVANCED_PROFILING" value="true" />
3304		- <option name="SUPPORT_LIB_ENABLED" value="true" />
3305		- <option name="INSTRUMENTATION_ENABLED" value="true" />
	3087	+ <option name="ADVANCED_PROFILING_ENABLED" value="false" />
3306	3088	</Profilers>
3307	3089	<option name="DEEP_LINK" value="" />
3308	3090	<option name="ACTIVITY_CLASS" value="" />
3309		- <method />
	3091	+ <method>
	3092	+ <option name="Android.Gradle.BeforeRunTask" enabled="true" />
	3093	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1509196512743" />
	3094	+ </method>
3310	3095	</configuration>
3311	3096	<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
3312	3097	<module name="" />

		@@ -3316,7 +3101,6 @@
3316	3101	<option name="CLASS_NAME" value="" />
3317	3102	<option name="PACKAGE_NAME" value="" />
3318	3103	<option name="EXTRA_OPTIONS" value="" />
3319		- <option name="PREFERRED_AVD" value="" />
3320	3104	<option name="CLEAR_LOGCAT" value="false" />
3321	3105	<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
3322	3106	<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />

		@@ -3350,11 +3134,12 @@
3350	3134	<option name="SHOW_OPTIMIZED_WARNING" value="true" />
3351	3135	</Native>
3352	3136	<Profilers>
3353		- <option name="ENABLE_ADVANCED_PROFILING" value="true" />
3354		- <option name="SUPPORT_LIB_ENABLED" value="true" />
3355		- <option name="INSTRUMENTATION_ENABLED" value="true" />
	3137	+ <option name="ADVANCED_PROFILING_ENABLED" value="false" />
3356	3138	</Profilers>
3357		- <method />
	3139	+ <method>
	3140	+ <option name="Android.Gradle.BeforeRunTask" enabled="true" />
	3141	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1509196512743" />
	3142	+ </method>
3358	3143	</configuration>
3359	3144	<configuration default="true" type="Application" factoryName="Application">
3360	3145	<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

		@@ -3396,6 +3181,27 @@
3396	3181	<setting name="debug" value="false" />
3397	3182	<method />
3398	3183	</configuration>
	3184	+ <configuration default="true" type="JUnit" factoryName="JUnit">
	3185	+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
	3186	+ <module name="" />
	3187	+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
	3188	+ <option name="ALTERNATIVE_JRE_PATH" />
	3189	+ <option name="PACKAGE_NAME" />
	3190	+ <option name="MAIN_CLASS_NAME" />
	3191	+ <option name="METHOD_NAME" />
	3192	+ <option name="TEST_OBJECT" value="class" />
	3193	+ <option name="VM_PARAMETERS" />
	3194	+ <option name="PARAMETERS" />
	3195	+ <option name="WORKING_DIRECTORY" />
	3196	+ <option name="ENV_VARIABLES" />
	3197	+ <option name="PASS_PARENT_ENVS" value="true" />
	3198	+ <option name="TEST_SEARCH_SCOPE">
	3199	+ <value defaultName="singleModule" />
	3200	+ </option>
	3201	+ <envs />
	3202	+ <patterns />
	3203	+ <method />
	3204	+ </configuration>
3399	3205	<configuration default="true" type="JarApplication" factoryName="JAR Application">
3400	3206	<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
3401	3207	<envs />

		@@ -3417,6 +3223,31 @@
3417	3223	<envs />
3418	3224	<method />
3419	3225	</configuration>
	3226	+ <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
	3227	+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
	3228	+ <option name="MAIN_CLASS_NAME" />
	3229	+ <option name="VM_PARAMETERS" />
	3230	+ <option name="PROGRAM_PARAMETERS" />
	3231	+ <option name="WORKING_DIRECTORY" />
	3232	+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
	3233	+ <option name="ALTERNATIVE_JRE_PATH" />
	3234	+ <option name="PASS_PARENT_ENVS" value="true" />
	3235	+ <module name="openCVLibrary320" />
	3236	+ <envs />
	3237	+ <method />
	3238	+ </configuration>
	3239	+ <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
	3240	+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
	3241	+ <option name="filePath" />
	3242	+ <option name="vmParameters" />
	3243	+ <option name="alternativeJrePath" />
	3244	+ <option name="programParameters" />
	3245	+ <option name="passParentEnvs" value="true" />
	3246	+ <option name="workingDirectory" />
	3247	+ <option name="isAlternativeJrePathEnabled" value="false" />
	3248	+ <envs />
	3249	+ <method />
	3250	+ </configuration>
3420	3251	<configuration default="true" type="Remote" factoryName="Remote">
3421	3252	<option name="USE_SOCKET_TRANSPORT" value="true" />
3422	3253	<option name="SERVER_MODE" value="false" />

		@@ -3453,34 +3284,6 @@
3453	3284	<listeners />
3454	3285	<method />
3455	3286	</configuration>
3456		- <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
3457		- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
3458		- <module name="" />
3459		- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
3460		- <option name="ALTERNATIVE_JRE_PATH" />
3461		- <option name="SUITE_NAME" />
3462		- <option name="PACKAGE_NAME" />
3463		- <option name="MAIN_CLASS_NAME" />
3464		- <option name="METHOD_NAME" />
3465		- <option name="GROUP_NAME" />
3466		- <option name="TEST_OBJECT" value="CLASS" />
3467		- <option name="VM_PARAMETERS" />
3468		- <option name="PARAMETERS" />
3469		- <option name="WORKING_DIRECTORY" />
3470		- <option name="OUTPUT_DIRECTORY" />
3471		- <option name="ANNOTATION_TYPE" />
3472		- <option name="ENV_VARIABLES" />
3473		- <option name="PASS_PARENT_ENVS" value="true" />
3474		- <option name="TEST_SEARCH_SCOPE">
3475		- <value defaultName="singleModule" />
3476		- </option>
3477		- <option name="USE_DEFAULT_REPORTERS" value="false" />
3478		- <option name="PROPERTIES_FILE" />
3479		- <envs />
3480		- <properties />
3481		- <listeners />
3482		- <method />
3483		- </configuration>
3484	3287	<configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
3485	3288	<module name="app" />
3486	3289	<option name="DEPLOY" value="true" />

		@@ -3488,7 +3291,6 @@
3488	3291	<option name="PM_INSTALL_OPTIONS" value="" />
3489	3292	<option name="ACTIVITY_EXTRA_FLAGS" value="" />
3490	3293	<option name="MODE" value="default_activity" />
3491		- <option name="PREFERRED_AVD" value="" />
3492	3294	<option name="CLEAR_LOGCAT" value="false" />
3493	3295	<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
3494	3296	<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />

		@@ -3522,13 +3324,14 @@
3522	3324	<option name="SHOW_OPTIMIZED_WARNING" value="true" />
3523	3325	</Native>
3524	3326	<Profilers>
3525		- <option name="ENABLE_ADVANCED_PROFILING" value="true" />
3526		- <option name="SUPPORT_LIB_ENABLED" value="true" />
3527		- <option name="INSTRUMENTATION_ENABLED" value="true" />
	3327	+ <option name="ADVANCED_PROFILING_ENABLED" value="false" />
3528	3328	</Profilers>
3529	3329	<option name="DEEP_LINK" value="" />
3530	3330	<option name="ACTIVITY_CLASS" value="" />
3531		- <method />
	3331	+ <method>
	3332	+ <option name="Android.Gradle.BeforeRunTask" enabled="true" />
	3333	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1509196512743" />
	3334	+ </method>
3532	3335	</configuration>
3533	3336	<list size="1">
3534	3337	<item index="0" class="java.lang.String" itemvalue="Android App.app" />

		@@ -3703,20 +3506,6 @@
3703	3506	<option name="presentableId" value="Default" />
3704	3507	<updated>1469871562549</updated>
3705	3508	</task>
3706		- <task id="LOCAL-00123" summary="操作パネル搭載のための準備その８。押した位置を拾う。">
3707		- <created>1495035014031</created>
3708		- <option name="number" value="00123" />
3709		- <option name="presentableId" value="LOCAL-00123" />
3710		- <option name="project" value="LOCAL" />
3711		- <updated>1495035014032</updated>
3712		- </task>
3713		- <task id="LOCAL-00124" summary="操作パネル搭載のための準備その９。押した位置を拾う。">
3714		- <created>1495121721473</created>
3715		- <option name="number" value="00124" />
3716		- <option name="presentableId" value="LOCAL-00124" />
3717		- <option name="project" value="LOCAL" />
3718		- <updated>1495121721473</updated>
3719		- </task>
3720	3509	<task id="LOCAL-00125" summary="操作パネル搭載のための準備その10。スワイプ入れたが動いていない。落ち着いて考える。">
3721	3510	<created>1495211322483</created>
3722	3511	<option name="number" value="00125" />

		@@ -4046,7 +3835,21 @@
4046	3835	<option name="project" value="LOCAL" />
4047	3836	<updated>1507908483305</updated>
4048	3837	</task>
4049		- <option name="localTasksCounter" value="172" />
	3838	+ <task id="LOCAL-00172" summary="プロパティの設定を、現在設定と違うものだけ設定するようにした。">
	3839	+ <created>1508075887691</created>
	3840	+ <option name="number" value="00172" />
	3841	+ <option name="presentableId" value="LOCAL-00172" />
	3842	+ <option name="project" value="LOCAL" />
	3843	+ <updated>1508075887692</updated>
	3844	+ </task>
	3845	+ <task id="LOCAL-00173" summary="Android7 で、動画ファイルの共有ができなかった不具合を修正する。">
	3846	+ <created>1508081318199</created>
	3847	+ <option name="number" value="00173" />
	3848	+ <option name="presentableId" value="LOCAL-00173" />
	3849	+ <option name="project" value="LOCAL" />
	3850	+ <updated>1508081318199</updated>
	3851	+ </task>
	3852	+ <option name="localTasksCounter" value="174" />
4050	3853	<servers />
4051	3854	</component>
4052	3855	<component name="TodoView">

		@@ -4059,26 +3862,28 @@
4059	3862	</todo-panel>
4060	3863	</component>
4061	3864	<component name="ToolWindowManager">
4062		- <frame x="56" y="0" width="2505" height="1435" extended-state="0" />
4063		- <editor active="false" />
	3865	+ <frame x="56" y="0" width="2504" height="1440" extended-state="0" />
4064	3866	<layout>
	3867	+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
4065	3868	<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4066		- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.4875051" order="12" side_tool="false" content_ui="tabs" />
	3869	+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45774648" sideWeight="0.4875051" order="12" side_tool="false" content_ui="tabs" />
4067	3870	<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
	3871	+ <window_info id="Palette " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
4068	3872	<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
4069	3873	<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
4070	3874	<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="7" side_tool="true" content_ui="tabs" />
4071		- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46310833" sideWeight="0.4747798" order="8" side_tool="false" content_ui="tabs" />
4072	3875	<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.118238024" sideWeight="0.4923939" order="2" side_tool="false" content_ui="tabs" />
4073	3876	<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3265306" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
4074	3877	<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
	3878	+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
4075	3879	<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
4076	3880	<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4077	3881	<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46058732" sideWeight="0.50921756" order="11" side_tool="true" content_ui="tabs" />
4078		- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21548545" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
	3882	+ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
	3883	+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21516393" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
4079	3884	<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4080	3885	<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
4081		- <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
	3886	+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
4082	3887	<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4083	3888	<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
4084	3889	<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="7" side_tool="true" content_ui="tabs" />

		@@ -4086,14 +3891,14 @@
4086	3891	<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4087	3892	<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
4088	3893	<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
	3894	+ <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46310833" sideWeight="0.4747798" order="8" side_tool="false" content_ui="tabs" />
4089	3895	<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
4090	3896	<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="combo" />
4091		- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
4092	3897	<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
4093		- <window_info id="Palette " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
	3898	+ <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
4094	3899	<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
4095	3900	<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896355" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
4096		- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3320251" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
	3901	+ <window_info id="Find" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3317684" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4097	3902	</layout>
4098	3903	</component>
4099	3904	<component name="Vcs.Log.UiProperties">

		@@ -4108,8 +3913,6 @@
4108	3913	<option name="myLimit" value="2678400000" />
4109	3914	</component>
4110	3915	<component name="VcsManagerConfiguration">
4111		- <MESSAGE value="ブラケット撮影用ロジックを移植。（まだ使っていないけど。） " />
4112		- <MESSAGE value="ブラケット撮影機能を搭載した。 " />
4113	3916	<MESSAGE value="ブラケット撮影機能の撮影枚数を増やした。時間待ちの表示を変更した。 " />
4114	3917	<MESSAGE value="ブラケット撮影をインターバル撮影と名称変更し、セルフタイマーの機能もカバーした。 " />
4115	3918	<MESSAGE value="タイマーのON/OFFアイコンを追加。" />

		@@ -4133,7 +3936,9 @@
4133	3936	<MESSAGE value="ライブビュー画像についても共有できるようにする。" />
4134	3937	<MESSAGE value="ライブビュー保存時の画像、縦横サイズをギャラリーに渡す。" />
4135	3938	<MESSAGE value="次バージョン準備。" />
4136		- <option name="LAST_COMMIT_MESSAGE" value="次バージョン準備。" />
	3939	+ <MESSAGE value="プロパティの設定を、現在設定と違うものだけ設定するようにした。" />
	3940	+ <MESSAGE value="Android7 で、動画ファイルの共有ができなかった不具合を修正する。" />
	3941	+ <option name="LAST_COMMIT_MESSAGE" value="Android7 で、動画ファイルの共有ができなかった不具合を修正する。" />
4137	3942	</component>
4138	3943	<component name="XDebuggerManager">
4139	3944	<breakpoint-manager>

		@@ -4140,50 +3945,22 @@
4140	3945	<breakpoints-dialog>
4141	3946	<breakpoints-dialog />
4142	3947	</breakpoints-dialog>
4143		- <option name="time" value="35" />
	3948	+ <option name="time" value="36" />
4144	3949	</breakpoint-manager>
4145	3950	<watches-manager />
4146	3951	</component>
4147	3952	<component name="editorHistoryManager">
4148		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IIndicatorControl.java">
4149		- <provider selected="true" editor-type-id="text-editor">
4150		- <state relative-caret-position="119">
4151		- <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
4152		- </state>
4153		- </provider>
4154		- </entry>
4155		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/SequentialShotControl.java">
4156		- <provider selected="true" editor-type-id="text-editor">
4157		- <state relative-caret-position="136">
4158		- <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
4159		- </state>
4160		- </provider>
4161		- </entry>
4162		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraPropertyProxy.java">
4163		- <provider selected="true" editor-type-id="text-editor">
4164		- <state relative-caret-position="2040">
4165		- <caret line="182" column="45" selection-start-line="182" selection-start-column="45" selection-end-line="182" selection-end-column="45" />
4166		- </state>
4167		- </provider>
4168		- </entry>
4169	3953	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraProperty.java">
4170	3954	<provider selected="true" editor-type-id="text-editor">
4171	3955	<state relative-caret-position="578">
4172		- <caret line="34" column="33" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="33" />
	3956	+ <caret line="34" column="33" lean-forward="false" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="33" />
4173	3957	</state>
4174	3958	</provider>
4175	3959	</entry>
4176		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java">
4177		- <provider selected="true" editor-type-id="text-editor">
4178		- <state relative-caret-position="773">
4179		- <caret line="73" column="78" selection-start-line="73" selection-start-column="78" selection-end-line="73" selection-end-column="78" />
4180		- </state>
4181		- </provider>
4182		- </entry>
4183	3960	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPropertyListenerImpl.java">
4184	3961	<provider selected="true" editor-type-id="text-editor">
4185	3962	<state relative-caret-position="552">
4186		- <caret line="45" column="33" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="41" />
	3963	+ <caret line="45" column="33" lean-forward="false" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="41" />
4187	3964	</state>
4188	3965	</provider>
4189	3966	</entry>

		@@ -4190,7 +3967,7 @@
4190	3967	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ILoadSaveCameraProperties.java">
4191	3968	<provider selected="true" editor-type-id="text-editor">
4192	3969	<state relative-caret-position="34">
4193		- <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
	3970	+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4194	3971	</state>
4195	3972	</provider>
4196	3973	</entry>

		@@ -4197,7 +3974,7 @@
4197	3974	<entry file="jar://$APPLICATION_HOME_DIR$/jre/jre/lib/rt.jar!/javax/swing/plaf/basic/BasicInternalFrameTitlePane.class">
4198	3975	<provider selected="true" editor-type-id="text-editor">
4199	3976	<state relative-caret-position="277">
4200		- <caret line="470" column="17" selection-start-line="470" selection-start-column="17" selection-end-line="470" selection-end-column="17" />
	3977	+ <caret line="470" column="17" lean-forward="false" selection-start-line="470" selection-start-column="17" selection-end-line="470" selection-end-column="17" />
4201	3978	</state>
4202	3979	</provider>
4203	3980	</entry>

		@@ -4209,7 +3986,7 @@
4209	3986	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/myolycameraprops/ICameraPropertyLoadSaveOperations.java">
4210	3987	<provider selected="true" editor-type-id="text-editor">
4211	3988	<state relative-caret-position="34">
4212		- <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
	3989	+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4213	3990	</state>
4214	3991	</provider>
4215	3992	</entry>

		@@ -4216,7 +3993,7 @@
4216	3993	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraStatusListenerImpl.java">
4217	3994	<provider selected="true" editor-type-id="text-editor">
4218	3995	<state relative-caret-position="277">
4219		- <caret line="95" column="79" selection-start-line="95" selection-start-column="79" selection-end-line="95" selection-end-column="79" />
	3996	+ <caret line="95" column="79" lean-forward="false" selection-start-line="95" selection-start-column="79" selection-end-line="95" selection-end-column="79" />
4220	3997	</state>
4221	3998	</provider>
4222	3999	</entry>

		@@ -4223,7 +4000,7 @@
4223	4000	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java">
4224	4001	<provider selected="true" editor-type-id="text-editor">
4225	4002	<state relative-caret-position="68">
4226		- <caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
	4003	+ <caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
4227	4004	</state>
4228	4005	</provider>
4229	4006	</entry>

		@@ -4233,7 +4010,7 @@
4233	4010	</provider>
4234	4011	<provider editor-type-id="text-editor">
4235	4012	<state relative-caret-position="0">
4236		- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
	4013	+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
4237	4014	</state>
4238	4015	</provider>
4239	4016	</entry>

		@@ -4240,7 +4017,7 @@
4240	4017	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveViewListenerImpl.java">
4241	4018	<provider selected="true" editor-type-id="text-editor">
4242	4019	<state relative-caret-position="153">
4243		- <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
	4020	+ <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
4244	4021	</state>
4245	4022	</provider>
4246	4023	</entry>

		@@ -4247,28 +4024,14 @@
4247	4024	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java">
4248	4025	<provider selected="true" editor-type-id="text-editor">
4249	4026	<state relative-caret-position="537">
4250		- <caret line="43" column="22" selection-start-line="43" selection-start-column="22" selection-end-line="43" selection-end-column="22" />
	4027	+ <caret line="43" column="22" lean-forward="false" selection-start-line="43" selection-start-column="22" selection-end-line="43" selection-end-column="22" />
4251	4028	</state>
4252	4029	</provider>
4253	4030	</entry>
4254		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml">
4255		- <provider selected="true" editor-type-id="text-editor">
4256		- <state relative-caret-position="197">
4257		- <caret line="679" column="24" selection-start-line="679" selection-start-column="24" selection-end-line="679" selection-end-column="24" />
4258		- </state>
4259		- </provider>
4260		- </entry>
4261		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
4262		- <provider selected="true" editor-type-id="text-editor">
4263		- <state relative-caret-position="860">
4264		- <caret line="722" column="25" selection-start-line="722" selection-start-column="25" selection-end-line="722" selection-end-column="25" />
4265		- </state>
4266		- </provider>
4267		- </entry>
4268	4031	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPropertyUtilities.java">
4269	4032	<provider selected="true" editor-type-id="text-editor">
4270	4033	<state relative-caret-position="204">
4271		- <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
	4034	+ <caret line="12" column="6" lean-forward="false" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
4272	4035	</state>
4273	4036	</provider>
4274	4037	</entry>

		@@ -4275,7 +4038,7 @@
4275	4038	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/IStatusViewDrawer.java">
4276	4039	<provider selected="true" editor-type-id="text-editor">
4277	4040	<state relative-caret-position="34">
4278		- <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
	4041	+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4279	4042	</state>
4280	4043	</provider>
4281	4044	</entry>

		@@ -4285,234 +4048,280 @@
4285	4048	</provider>
4286	4049	<provider editor-type-id="text-editor">
4287	4050	<state relative-caret-position="1700">
4288		- <caret line="100" column="40" selection-start-line="100" selection-start-column="40" selection-end-line="100" selection-end-column="40" />
	4051	+ <caret line="100" column="40" lean-forward="false" selection-start-line="100" selection-start-column="40" selection-end-line="100" selection-end-column="40" />
4289	4052	</state>
4290	4053	</provider>
4291	4054	</entry>
4292		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java">
	4055	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraJpegSave.java">
4293	4056	<provider selected="true" editor-type-id="text-editor">
4294		- <state relative-caret-position="278">
4295		- <caret line="402" column="9" selection-start-line="402" selection-start-column="9" selection-end-line="402" selection-end-column="9" />
	4057	+ <state relative-caret-position="548">
	4058	+ <caret line="108" column="52" lean-forward="false" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
4296	4059	</state>
4297	4060	</provider>
4298	4061	</entry>
4299		- <entry file="file://$PROJECT_DIR$/build.gradle">
	4062	+ <entry file="file://C:/APL/Android/sdk/sources/android-25/android/hardware/Camera.java">
4300	4063	<provider selected="true" editor-type-id="text-editor">
4301		- <state relative-caret-position="0">
4302		- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
4303		- <folding />
	4064	+ <state relative-caret-position="273">
	4065	+ <caret line="1411" column="22" lean-forward="false" selection-start-line="1411" selection-start-column="22" selection-end-line="1411" selection-end-column="22" />
4304	4066	</state>
4305	4067	</provider>
4306	4068	</entry>
4307		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraJpegSave.java">
	4069	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraView.java">
4308	4070	<provider selected="true" editor-type-id="text-editor">
4309		- <state relative-caret-position="548">
4310		- <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
	4071	+ <state relative-caret-position="386">
	4072	+ <caret line="228" column="58" lean-forward="false" selection-start-line="228" selection-start-column="58" selection-end-line="228" selection-end-column="58" />
4311	4073	</state>
4312	4074	</provider>
4313	4075	</entry>
4314		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java">
	4076	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ILiveImageStatusNotify.java">
4315	4077	<provider selected="true" editor-type-id="text-editor">
4316		- <state relative-caret-position="514">
4317		- <caret line="429" column="79" selection-start-line="429" selection-start-column="79" selection-end-line="429" selection-end-column="79" />
	4078	+ <state relative-caret-position="136">
	4079	+ <caret line="8" column="10" lean-forward="false" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
4318	4080	</state>
4319	4081	</provider>
4320	4082	</entry>
4321		- <entry file="file://C:/APL/Android/sdk/sources/android-25/android/hardware/Camera.java">
	4083	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/IPhoneCameraShutter.java">
4322	4084	<provider selected="true" editor-type-id="text-editor">
4323		- <state relative-caret-position="273">
4324		- <caret line="1411" column="22" selection-start-line="1411" selection-start-column="22" selection-end-line="1411" selection-end-column="22" />
	4085	+ <state relative-caret-position="68">
	4086	+ <caret line="4" column="17" lean-forward="false" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
4325	4087	</state>
4326	4088	</provider>
4327	4089	</entry>
4328		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraView.java">
	4090	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ImageManipulator.java">
4329	4091	<provider selected="true" editor-type-id="text-editor">
4330		- <state relative-caret-position="386">
4331		- <caret line="228" column="58" selection-start-line="228" selection-start-column="58" selection-end-line="228" selection-end-column="58" />
	4092	+ <state relative-caret-position="697">
	4093	+ <caret line="721" column="6" lean-forward="false" selection-start-line="721" selection-start-column="6" selection-end-line="721" selection-end-column="6" />
4332	4094	</state>
4333	4095	</provider>
4334	4096	</entry>
4335		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ILiveImageStatusNotify.java">
	4097	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IImageManipulatorOperator.java">
4336	4098	<provider selected="true" editor-type-id="text-editor">
4337	4099	<state relative-caret-position="136">
4338		- <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
	4100	+ <caret line="9" column="10" lean-forward="false" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
4339	4101	</state>
4340	4102	</provider>
4341	4103	</entry>
4342		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/IPhoneCameraShutter.java">
	4104	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ManipulateImageFragment.java">
4343	4105	<provider selected="true" editor-type-id="text-editor">
	4106	+ <state relative-caret-position="1115">
	4107	+ <caret line="368" column="0" lean-forward="false" selection-start-line="368" selection-start-column="0" selection-end-line="368" selection-end-column="0" />
	4108	+ </state>
	4109	+ </provider>
	4110	+ </entry>
	4111	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageOperation.java">
	4112	+ <provider selected="true" editor-type-id="text-editor">
	4113	+ <state relative-caret-position="34">
	4114	+ <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
	4115	+ </state>
	4116	+ </provider>
	4117	+ </entry>
	4118	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageHolder.java">
	4119	+ <provider selected="true" editor-type-id="text-editor">
4344	4120	<state relative-caret-position="68">
4345		- <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
	4121	+ <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
4346	4122	</state>
4347	4123	</provider>
4348	4124	</entry>
4349		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java">
	4125	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/EffectImageProcessor.java">
4350	4126	<provider selected="true" editor-type-id="text-editor">
4351		- <state relative-caret-position="140">
4352		- <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" />
	4127	+ <state relative-caret-position="833">
	4128	+ <caret line="380" column="29" lean-forward="false" selection-start-line="365" selection-start-column="0" selection-end-line="387" selection-end-column="0" />
4353	4129	</state>
4354	4130	</provider>
4355	4131	</entry>
4356		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java">
	4132	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/IStoreImage.java">
4357	4133	<provider selected="true" editor-type-id="text-editor">
4358		- <state relative-caret-position="155">
4359		- <caret line="155" column="9" selection-start-line="155" selection-start-column="9" selection-end-line="155" selection-end-column="9" />
	4134	+ <state relative-caret-position="153">
	4135	+ <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
4360	4136	</state>
4361	4137	</provider>
4362	4138	</entry>
4363		- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
4364		- <provider editor-type-id="android-designer2">
4365		- <state />
	4139	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImageView.java">
	4140	+ <provider selected="true" editor-type-id="text-editor">
	4141	+ <state relative-caret-position="136">
	4142	+ <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
	4143	+ </state>
4366	4144	</provider>
	4145	+ </entry>
	4146	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OLYCameraContentInfoEx.java">
4367	4147	<provider selected="true" editor-type-id="text-editor">
4368		- <state relative-caret-position="580">
4369		- <caret line="173" column="0" selection-start-line="173" selection-start-column="0" selection-end-line="173" selection-end-column="0" />
	4148	+ <state relative-caret-position="68">
	4149	+ <caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
4370	4150	</state>
4371	4151	</provider>
4372	4152	</entry>
4373		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
	4153	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/StoreImage.java">
4374	4154	<provider selected="true" editor-type-id="text-editor">
4375		- <state relative-caret-position="357">
4376		- <caret line="88" column="85" selection-start-line="88" selection-start-column="85" selection-end-line="88" selection-end-column="85" />
	4155	+ <state relative-caret-position="1080">
	4156	+ <caret line="160" column="15" lean-forward="false" selection-start-line="160" selection-start-column="15" selection-end-line="160" selection-end-column="15" />
4377	4157	</state>
4378	4158	</provider>
4379	4159	</entry>
4380		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java">
	4160	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPropertyLoadSaveOperations.java">
4381	4161	<provider selected="true" editor-type-id="text-editor">
4382		- <state relative-caret-position="17">
4383		- <caret line="152" column="40" selection-start-line="152" selection-start-column="40" selection-end-line="152" selection-end-column="40" />
	4162	+ <state relative-caret-position="995">
	4163	+ <caret line="177" column="50" lean-forward="false" selection-start-line="177" selection-start-column="39" selection-end-line="177" selection-end-column="57" />
4384	4164	</state>
4385	4165	</provider>
4386	4166	</entry>
4387		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ImageManipulator.java">
	4167	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java">
4388	4168	<provider selected="true" editor-type-id="text-editor">
4389		- <state relative-caret-position="697">
4390		- <caret line="721" column="6" selection-start-line="721" selection-start-column="6" selection-end-line="721" selection-end-column="6" />
	4169	+ <state relative-caret-position="179">
	4170	+ <caret line="262" column="23" lean-forward="false" selection-start-line="262" selection-start-column="23" selection-end-line="262" selection-end-column="23" />
	4171	+ <folding />
4391	4172	</state>
4392	4173	</provider>
4393	4174	</entry>
4394		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IImageManipulatorOperator.java">
	4175	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java">
4395	4176	<provider selected="true" editor-type-id="text-editor">
4396		- <state relative-caret-position="136">
4397		- <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
	4177	+ <state relative-caret-position="372">
	4178	+ <caret line="682" column="0" lean-forward="false" selection-start-line="682" selection-start-column="0" selection-end-line="682" selection-end-column="0" />
4398	4179	</state>
4399	4180	</provider>
4400	4181	</entry>
4401		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ManipulateImageFragment.java">
	4182	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImagePager.java">
4402	4183	<provider selected="true" editor-type-id="text-editor">
4403		- <state relative-caret-position="1115">
4404		- <caret line="368" column="0" selection-start-line="368" selection-start-column="0" selection-end-line="368" selection-end-column="0" />
	4184	+ <state relative-caret-position="153">
	4185	+ <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
4405	4186	</state>
4406	4187	</provider>
4407	4188	</entry>
4408		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageOperation.java">
	4189	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConnectingFragment.java">
4409	4190	<provider selected="true" editor-type-id="text-editor">
4410		- <state relative-caret-position="34">
4411		- <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
	4191	+ <state relative-caret-position="774">
	4192	+ <caret line="122" column="7" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="123" selection-end-column="0" />
	4193	+ <folding />
4412	4194	</state>
4413	4195	</provider>
4414	4196	</entry>
4415		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageHolder.java">
	4197	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java">
4416	4198	<provider selected="true" editor-type-id="text-editor">
4417		- <state relative-caret-position="68">
4418		- <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
	4199	+ <state relative-caret-position="723">
	4200	+ <caret line="86" column="11" lean-forward="false" selection-start-line="86" selection-start-column="11" selection-end-line="86" selection-end-column="11" />
4419	4201	</state>
4420	4202	</provider>
4421	4203	</entry>
4422		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/EffectImageProcessor.java">
	4204	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml">
4423	4205	<provider selected="true" editor-type-id="text-editor">
4424		- <state relative-caret-position="833">
4425		- <caret line="380" column="29" selection-start-line="365" selection-start-column="0" selection-end-line="387" selection-end-column="0" />
	4206	+ <state relative-caret-position="646">
	4207	+ <caret line="86" column="3" lean-forward="false" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="61" />
4426	4208	</state>
4427	4209	</provider>
4428	4210	</entry>
4429		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
	4211	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
4430	4212	<provider selected="true" editor-type-id="text-editor">
4431		- <state relative-caret-position="918">
4432		- <caret line="303" column="0" selection-start-line="303" selection-start-column="0" selection-end-line="303" selection-end-column="0" />
	4213	+ <state relative-caret-position="323">
	4214	+ <caret line="86" column="2" lean-forward="false" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="76" />
	4215	+ <folding />
4433	4216	</state>
4434	4217	</provider>
4435	4218	</entry>
4436		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
	4219	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml">
4437	4220	<provider selected="true" editor-type-id="text-editor">
4438		- <state relative-caret-position="17">
4439		- <caret line="134" column="19" selection-start-line="134" selection-start-column="19" selection-end-line="134" selection-end-column="19" />
	4221	+ <state relative-caret-position="842">
	4222	+ <caret line="717" column="17" lean-forward="false" selection-start-line="716" selection-start-column="0" selection-end-line="730" selection-end-column="19" />
4440	4223	</state>
4441	4224	</provider>
4442	4225	</entry>
4443		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/IStoreImage.java">
	4226	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
4444	4227	<provider selected="true" editor-type-id="text-editor">
4445		- <state relative-caret-position="153">
4446		- <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
	4228	+ <state relative-caret-position="859">
	4229	+ <caret line="722" column="16" lean-forward="false" selection-start-line="720" selection-start-column="0" selection-end-line="735" selection-end-column="0" />
	4230	+ <folding />
4447	4231	</state>
4448	4232	</provider>
4449	4233	</entry>
4450		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml">
	4234	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
	4235	+ <provider editor-type-id="android-designer2">
	4236	+ <state />
	4237	+ </provider>
4451	4238	<provider selected="true" editor-type-id="text-editor">
4452		- <state relative-caret-position="680">
4453		- <caret line="88" column="54" selection-start-line="88" selection-start-column="54" selection-end-line="88" selection-end-column="54" />
	4239	+ <state relative-caret-position="640">
	4240	+ <caret line="130" column="17" lean-forward="false" selection-start-line="128" selection-start-column="0" selection-end-line="133" selection-end-column="40" />
4454	4241	</state>
4455	4242	</provider>
4456	4243	</entry>
4457		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java">
	4244	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
4458	4245	<provider selected="true" editor-type-id="text-editor">
4459		- <state relative-caret-position="7540">
4460		- <caret line="1114" column="0" selection-start-line="1114" selection-start-column="0" selection-end-line="1114" selection-end-column="0" />
	4246	+ <state relative-caret-position="570">
	4247	+ <caret line="589" column="34" lean-forward="false" selection-start-line="589" selection-start-column="0" selection-end-line="595" selection-end-column="0" />
	4248	+ <folding />
4461	4249	</state>
4462	4250	</provider>
4463	4251	</entry>
4464		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImageView.java">
	4252	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java">
4465	4253	<provider selected="true" editor-type-id="text-editor">
4466		- <state relative-caret-position="136">
4467		- <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
	4254	+ <state relative-caret-position="167">
	4255	+ <caret line="319" column="25" lean-forward="false" selection-start-line="319" selection-start-column="25" selection-end-line="319" selection-end-column="25" />
	4256	+ <folding />
4468	4257	</state>
4469	4258	</provider>
4470	4259	</entry>
4471		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OLYCameraContentInfoEx.java">
	4260	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
4472	4261	<provider selected="true" editor-type-id="text-editor">
	4262	+ <state relative-caret-position="341">
	4263	+ <caret line="673" column="32" lean-forward="false" selection-start-line="673" selection-start-column="32" selection-end-line="673" selection-end-column="32" />
	4264	+ <folding />
	4265	+ </state>
	4266	+ </provider>
	4267	+ </entry>
	4268	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java">
	4269	+ <provider selected="true" editor-type-id="text-editor">
	4270	+ <state relative-caret-position="961">
	4271	+ <caret line="283" column="40" lean-forward="false" selection-start-line="283" selection-start-column="29" selection-end-line="283" selection-end-column="55" />
	4272	+ <folding />
	4273	+ </state>
	4274	+ </provider>
	4275	+ </entry>
	4276	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycameraproperty/CameraPropertyLoader.java">
	4277	+ <provider selected="true" editor-type-id="text-editor">
4473	4278	<state relative-caret-position="68">
4474		- <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
	4279	+ <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
4475	4280	</state>
4476	4281	</provider>
4477	4282	</entry>
4478		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImagePager.java">
	4283	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java">
4479	4284	<provider selected="true" editor-type-id="text-editor">
4480		- <state relative-caret-position="153">
4481		- <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
	4285	+ <state relative-caret-position="2331">
	4286	+ <caret line="269" column="26" lean-forward="false" selection-start-line="269" selection-start-column="26" selection-end-line="269" selection-end-column="26" />
4482	4287	</state>
4483	4288	</provider>
4484	4289	</entry>
4485		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/StoreImage.java">
	4290	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java">
4486	4291	<provider selected="true" editor-type-id="text-editor">
4487		- <state relative-caret-position="1080">
4488		- <caret line="160" column="15" selection-start-line="160" selection-start-column="15" selection-end-line="160" selection-end-column="15" />
4489		- <folding>
4490		- <element signature="e#4737#5243#0" expanded="false" />
4491		- <element signature="e#5242#5243#0" expanded="false" />
4492		- </folding>
	4292	+ <state relative-caret-position="516">
	4293	+ <caret line="177" column="47" lean-forward="false" selection-start-line="177" selection-start-column="37" selection-end-line="177" selection-end-column="59" />
	4294	+ <folding />
4493	4295	</state>
4494	4296	</provider>
4495	4297	</entry>
4496		- <entry file="file://$PROJECT_DIR$/app/build.gradle">
	4298	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java">
4497	4299	<provider selected="true" editor-type-id="text-editor">
4498		- <state relative-caret-position="493">
4499		- <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
	4300	+ <state relative-caret-position="265">
	4301	+ <caret line="532" column="33" lean-forward="false" selection-start-line="532" selection-start-column="33" selection-end-line="532" selection-end-column="33" />
	4302	+ </state>
	4303	+ </provider>
	4304	+ </entry>
	4305	+ <entry file="file://$PROJECT_DIR$/openCVLibrary320/build.gradle">
	4306	+ <provider selected="true" editor-type-id="text-editor">
	4307	+ <state relative-caret-position="204">
	4308	+ <caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
4500	4309	<folding />
4501	4310	</state>
4502	4311	</provider>
4503	4312	</entry>
4504		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java">
	4313	+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
4505	4314	<provider selected="true" editor-type-id="text-editor">
4506		- <state relative-caret-position="1411">
4507		- <caret line="95" column="7" selection-start-line="95" selection-start-column="7" selection-end-line="95" selection-end-column="7" />
	4315	+ <state relative-caret-position="136">
	4316	+ <caret line="8" column="24" lean-forward="false" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
4508	4317	<folding />
4509	4318	</state>
4510	4319	</provider>
4511	4320	</entry>
4512		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPropertyLoadSaveOperations.java">
	4321	+ <entry file="file://$PROJECT_DIR$/build.gradle">
4513	4322	<provider selected="true" editor-type-id="text-editor">
4514		- <state relative-caret-position="995">
4515		- <caret line="177" column="50" selection-start-line="177" selection-start-column="39" selection-end-line="177" selection-end-column="57" />
	4323	+ <state relative-caret-position="289">
	4324	+ <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
4516	4325	<folding />
4517	4326	</state>
4518	4327	</provider>

Afficher sur ancien navigateur de dépôt.