Merge "Fix the function to get baseband version correctly in telephony manager."

author Pankaj Kanwar <pkanwar@google.com>

Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)
author Pankaj Kanwar <pkanwar@google.com>
Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Pankaj Kanwar <pkanwar@google.com>
	Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)