commit | cb45ab8ecfbe3827d1084480ff60d11126fcf6eb | [log] [tgz] |
---|---|---|
author | Dirk Dougherty <ddougherty@google.com> | Fri Nov 30 15:44:24 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 15:44:24 2012 -0800 |
tree | 4de6e7ab7077d4b0166249f2d2c64e7c4acc14fd | |
parent | ca4199ef8b70f73f914b72ec69fc596c2ca600e2 [diff] | |
parent | 338b3a2f96e7625a31f9cb38033d3444d450c387 [diff] |
am 338b3a2f: 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 '338b3a2f96e7625a31f9cb38033d3444d450c387': Doc change: add SMP Primer for Android. Support a new "article" toc style in training.