Commit 47a6b765 authored Aug 04, 2016 by Hans Boehm

resolve merge conflicts of c73e080e to nyc-dev-plus-aosp

Change-Id: I9629e28bff28a67a6584c5e67a01ef25428a2194

docs/html/training/articles/smp.jd

+860 −1354

File changed.

Preview size limit exceeded, changes collapsed.