Wing328 android reserved word travis#1845

Merged

fehguy merged 3 commits intomasterfrom wing328-android_reserved_word-travis

Jan 7, 2016

+33-17

Commits on Jan 7, 2016

update reserved word to include local variable names for android, scala
wing328
committed
Merge branch 'android_reserved_word' of https://github.com/wing328/swagger-codegen into wing328-android_reserved_word
fehguy
committed
Merge branch 'wing328-android_reserved_word'
fehguy
committed