Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"

author Treehugger Robot <treehugger-gerrit@google.com>

Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Sat, 15 Apr 2017 01:43:00 +0000 (01:43 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 15 Apr 2017 01:43:00 +0000 (01:43 +0000)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Sat, 15 Apr 2017 01:43:00 +0000 (01:43 +0000)