Julian Cerruti f33ac20e77 Merge branch 'master' into cni-master %!s(int64=12) %!d(string=hai) anos
..
res b463b4336d Changes all Android projects under android_core to support both Eclipse and Android Studio. %!s(int64=12) %!d(string=hai) anos
src f33ac20e77 Merge branch 'master' into cni-master %!s(int64=12) %!d(string=hai) anos
AndroidManifest.xml fca3280e17 Resolve conflicts with master branch. %!s(int64=12) %!d(string=hai) anos
build.gradle 18d88376a7 use ROS_MAVEN_REPOSITORY and constrain open range dependencies %!s(int64=12) %!d(string=hai) anos