| commit | 51691e43652d68285250ac5b60d7f071b6460fce | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Fri Nov 16 10:36:02 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 16 10:36:02 2012 -0800 |
| tree | d30305429ccc4e42fe2da737819ac654dddb4006 | |
| parent | b8a3f5550a3581f73f37706a1f81678f4d7daf2b [diff] | |
| parent | b80d578c8f66302584969aadbac3e723e1717f81 [diff] |
am b80d578c: am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev * commit 'b80d578c8f66302584969aadbac3e723e1717f81': implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.