DER 1.2
Merge branch 'master' of https://github.com/salvachz/java-android-WS