commit 7066ed79e177b5c139d0aa43ea3e355801b73c6d
author Amit Mahajan <amitmahajan@google.com> Wed Oct 08 00:29:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 00:29:43 2014 +0000
tree bfee2de8c31abcb652fe277da6019effc910402a
parent 453fc7e8ef3f53196d32aa1d08363cb9298f5ffa
parent 536cae75031e11ee30da0a0b4d4a0752e5526e96

am 536cae75: Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

* commit '536cae75031e11ee30da0a0b4d4a0752e5526e96':
  Send SMS over 1x when on eHRPD/LTE and active voice call

src/java/com/android/internal/telephony/MccTable.java

diff --git a/src/java/com/android/internal/telephony/MccTable.java b/src/java/com/android/internal/telephony/MccTable.java
index e7d59b0..1223644 100644
--- a/src/java/com/android/internal/telephony/MccTable.java
+++ b/src/java/com/android/internal/telephony/MccTable.java
@@ -248,7 +248,7 @@
      *
      * @return Locale or null if no appropriate value
      */
-    public static Locale getLocaleForLanguageCountry(Context context, String language,
+    private static Locale getLocaleForLanguageCountry(Context context, String language,
             String country) {
         if (language == null) {
             Slog.d(LOG_TAG, "getLocaleForLanguageCountry: skipping no language");