diff options
| author | Scott Main <smain@google.com> | 2012-11-14 19:13:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-14 19:13:05 -0800 |
| commit | 0622ed7fbb64e1cd156c453d9412b544c4e84fb1 (patch) | |
| tree | 45ae49ed2b6aad52a4d352692c13357e825831e0 /tools/aidl/generate_java.cpp | |
| parent | 335cbfa89a8b604562bc2bc325b20236cd178fec (diff) | |
| parent | 0034beab72d6574de5009e5947729a2bfd17d66e (diff) | |
am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev
* commit '0034beab72d6574de5009e5947729a2bfd17d66e':
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.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions