Merge branch 'upstream/master'

README.md

@@ -55,6 +55,25 @@ Run your project (Cmd+R)
 
 ### Android
 
+- in `android/app/build.gradle`:
+
+```diff
+dependencies {
+    ...
+    compile "com.facebook.react:react-native:+"  // From node_modules
++   compile project(':react-native-device-info')
+}
+```
+
+- in `android/settings.gradle`:
+
+```diff
+...
+include ':app'
++ include ':react-native-device-info'
++ project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
+```
+
 #### With React Native 0.29+
 
 - in `MainApplication.java`:

RNDeviceInfo/RNDeviceInfo.m

@@ -157,7 +157,6 @@ RCT_EXPORT_MODULE()
 {
     UIDevice *currentDevice = [UIDevice currentDevice];
 
-    NSUUID *identifierForVendor = [currentDevice identifierForVendor];
     NSString *uniqueId = [DeviceUID uid];
 
     return @{