| commit | b80d578c8f66302584969aadbac3e723e1717f81 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Nov 14 19:17:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 19:17:27 2012 -0800 |
| tree | 5c44b842344263e47b3c17ef6e0c2aaad02d687d | |
| parent | cf28892a71bf1b9e5e4dd0c4f9c117c393d562c5 [diff] | |
| parent | 2da041f09d5d68d79b1455aedce6527ea6c5dd89 [diff] |
am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev * commit '2da041f09d5d68d79b1455aedce6527ea6c5dd89': 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.