Pritesh Nandgaonkar 88a6cff373 Fix merge conflicts

2018-06-19 15:31:33 +01:00

..

cxx

Use the latest fbjni

2018-06-15 15:55:10 +01:00

java/com/facebook/jni

update

2018-06-19 14:08:12 +01:00

ApplicationManifest.xml

Use the latest fbjni

2018-06-15 15:55:10 +01:00

BUCK

Use the latest fbjni

2018-06-15 15:55:10 +01:00

build.gradle

app builds but not with sonarfb

2018-06-18 18:45:37 +01:00

CMakeLists.txt

update

2018-06-19 14:08:12 +01:00