Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style...

author Dirk Dougherty <ddougherty@google.com>

Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
author Dirk Dougherty <ddougherty@google.com>
Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
diff --cc docs/html/training/articles/security-tips.jd
Simple merge
diff --cc docs/html/training/training_toc.cs
Simple merge
author	Dirk Dougherty <ddougherty@google.com>
	Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)
		1	2
docs/html/training/articles/security-tips.jd	patch \|	diff1 \|	diff2 \|	blob \| history
docs/html/training/training_toc.cs	patch \|	diff1 \|	diff2 \|	blob \| history