| commit | 338b3a2f96e7625a31f9cb38033d3444d450c387 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri Nov 30 15:41:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 15:41:21 2012 -0800 |
| tree | 878b2dbe397c15335c5759193bb1bd702382d6e1 | |
| parent | 04f3b12f1f82784d0b1b8c0812a3d0017b17b69e [diff] | |
| parent | 0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc [diff] |
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 '0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc': Doc change: add SMP Primer for Android. Support a new "article" toc style in training.