[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66a1e930d1 -s ours
am skip reason: subject contains skip directive
Change-Id: I768d83c1831d91af26843f4c9a6429f1d915c8c9
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
index db5ef3d..a52a1fa 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
@@ -55,7 +55,7 @@
/** Information about the current build, taken from system properties. */
public static void logDeviceInfo(String tag) {
Log.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
- + "Release: " + Build.VERSION.RELEASE + ", "
+ + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", "
+ "Brand: " + Build.BRAND + ", "
+ "Device: " + Build.DEVICE + ", "
+ "Id: " + Build.ID + ", "
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
index 9f025c4..fc236b3 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
@@ -43,7 +43,7 @@
}
public static String getBuildRelease() {
- return Build.VERSION.RELEASE;
+ return Build.VERSION.RELEASE_OR_CODENAME;
}
public static String getSdkVersion() {
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
index 45f564a..b216e8d 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
@@ -182,7 +182,7 @@
// Information about the current build, taken from system properties.
public static void logDeviceInfo(String tag) {
Logging.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
- + "Release: " + Build.VERSION.RELEASE + ", "
+ + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", "
+ "Brand: " + Build.BRAND + ", "
+ "Device: " + Build.DEVICE + ", "
+ "Id: " + Build.ID + ", "
