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

Commit 3e770a7f authored by Robert Ly's avatar Robert Ly
Browse files

resolved conflicts for merge of ec5ca94c to master

Change-Id: Id24be07a6a4abf1beec5f9dc6da6b752201c4838
parents a0c0ca98 ec5ca94c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@
          <li><a href="<?cs var:toroot ?>guide/developing/tools/layoutopt.html">layoutopt</a></li>
          <li><a href="<?cs var:toroot ?>guide/developing/tools/logcat.html">logcat</a></li>
          <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li>

          <li><a href="/guide/developing/tools/monkey.html">Monkey</a></li>
          <li class="toggle-list">
            <div><a href="/guide/developing/tools/monkeyrunner_concepts.html">