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

Commit 65bdc59e authored by Robert Ly's avatar Robert Ly
Browse files

resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp 

Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
parents 6059bb3e 810c1c0c

docs/html/guide/guide_toc.cs

+7 −4
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ 
      <li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html">

            <span class="en">Bluetooth</span>

          </a></li>

      <li><a href="<?cs var:toroot?>guide/topics/nfc/index.html">

            <span class="en">Near Field Communication</span></a>

            <span class="new">new!</span></li>

       <li><a href="<?cs var:toroot?>guide/topics/network/sip.html">

            <span class="en">Session Initiation Protocol</span></a>

            <span class="new">new!</span>

docs/html/guide/topics/nfc/index.jd

0 → 100644
+600 −0

File added.

Preview size limit exceeded, changes collapsed.