OSDN Git Service

Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style...
authorDirk Dougherty <ddougherty@google.com>
Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
commit23b4e5b1b5c3af565f2af87be243e7b455002ae7
tree444a3f1b5043b9576b87933644b9dbd86d77a1dc
parent759c1005b3f96ea8bbf59192d206aacece315655
parentd5894210930fc0a8bc3733258747d837e2960fa9
Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
docs/html/training/articles/security-tips.jd
docs/html/training/training_toc.cs