Merge remote-tracking branch 'android-master/master' into 3.0.X

This commit is contained in:
Margaux Clerc 2015-10-29 14:52:23 +01:00
commit 31d70f012c

@ -1 +1 @@
Subproject commit c4cf58931e7db458c5f2f9775f2bdb7a6d1b9f67
Subproject commit ad29346e10addd4e5b1e3cf18dd2bc0546756f59