Merge branch 'patch-3' of github.com:nignag/soot into develop
Merge branch 'develop' of github.com:Sable/soot into develop
Add notes on nightly build
Merge pull request #184 from gdevanla/develop

Add notes on nightly build
Added timer option check in ClassFile
Merge branch 'develop' of github.com:Sable/soot into develop
when the string index is greater than 2^16, the const-string "jumbo" instruction must be used instead of the const-string instruction
(Dalvik) Use correct nnotation visibility. Write field constants to .apk
(Dalvik) add empty annotation tag for parameters without annotation
Merge pull request #189 from malaverdiere/fix-timer

Added timer option check in ClassFile
(Dalvik) Transform DeprecatedTag as AnnotationTag for ParameterTags
Merge branch 'develop' of ssh://github.com/Sable/soot into develop
Merge branch 'develop' of github.com:Sable/soot into develop
Bugfix: If there is a directory that does not follow the Android naming structure inside the "platforms" directory of the Android SDK, that should not crash Soot. We instead simply ignore the outlier.
added a generic type
Revert "added a generic type"

This reverts commit 603e9166a065ba93768c3cb1e74bf291c4f6b602.
got rid of a Java warning
removed another Java warning
removed Java warning
removed Java warning