Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3fd7e1b authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolved conflicts for merge of d93f4c8b to master 

Change-Id: Iec5cabbeb128a4696a8a670afbf2f4cb9ebdb2de
parents c8129296 d93f4c8b

docs/html/reference/android/support/test/InstrumentationRegistry.html

0 → 100644
+1378 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/reference/android/support/test/espresso/AmbiguousViewMatcherException.Builder.html

0 → 100644
+1533 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/reference/android/support/test/espresso/AmbiguousViewMatcherException.html

0 → 100644
+1429 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/reference/android/support/test/espresso/AppNotIdleException.html

0 → 100644
+1485 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/reference/android/support/test/espresso/DataInteraction.html

0 → 100644
+1513 −0

File added.

Preview size limit exceeded, changes collapsed.