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

Commit f0256aba authored by Joe Fernandez's avatar Joe Fernandez
Browse files

resolved conflicts for merge of dda0cb9f to master

Change-Id: Id649a91b403f0b6c077ada1c11495657ddc6d181
parents 3bf22c31 dda0cb9f
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ Continue: Adding SDK Packages</a></p>
<div id="default" style="display:none">

<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download
the Android SDK bundle for Android Studio or the stand-alone SDK Tools</a></b>. </p>
the Android SDK bundle for Android Studio</a></b> or the
<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p>

<p>Then, select which SDK bundle you want to install:</p>