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

Commit 338b3a2f authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android.... 

am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

* commit '0a40f2d4':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
parents 04f3b12f 0a40f2d4

docs/html/training/articles/perf-anr.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Keeping Your App Responsive

page.article=true

@jd:body



<div id="tb-wrapper">

docs/html/training/articles/perf-jni.jd

+1 −0
Original line number Diff line number Diff line 
page.title=JNI Tips

page.article=true

@jd:body



<div id="tb-wrapper">

docs/html/training/articles/perf-tips.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Performance Tips

page.article=true

@jd:body



<div id="tb-wrapper">

docs/html/training/articles/security-tips.jd

+4 −3
Original line number Diff line number Diff line 
page.title=Security Tips

page.article=true

@jd:body



<div id="tb-wrapper">

<div id="tb">

<h2>In this document</h2>

<ol>

<ol class="nolist">

  <li><a href="#StoringData">Storing Data</a></li>

  <li><a href="#Permissions">Using Permissions</a></li>

  <li><a href="#Networking">Using Networking</a></li>
@@ -18,11 +19,11 @@ page.title=Security Tips 
  <li><a href="#Native">Security in Native Code</a></li>

</ol>

<h2>See also</h2>

<ol>

<ul>

<li><a href="http://source.android.com/tech/security/index.html">Android

Security Overview</a></li>

<li><a href="{@docRoot}guide/topics/security/permissions.html">Permissions</a></li>

</ol>

</ul>

</div></div>

docs/html/training/articles/smp.jd

0 → 100644
+1889 −0

File added.

Preview size limit exceeded, changes collapsed.