Merge pull request #275 from cjpearson/CB12953
authorJoe Bowser <bowserj@apache.org>
Wed, 14 Mar 2018 19:44:35 +0000 (12:44 -0700)
committerGitHub <noreply@github.com>
Wed, 14 Mar 2018 19:44:35 +0000 (12:44 -0700)
commitc8581ba2c9b057987b890483c22c09bb17414077
tree36ae0d000c71630f1ac0bd069fed25eb0028928a
parente36482c7ba1e5dec07f68a246f3ecde8743d7cd6
parentcfefa53272d48c0067bd4a71345f1d6b328ff96f
Merge pull request #275 from cjpearson/CB12953

CB-12593: (android) Fix potential FileProvider conflicts
plugin.xml