Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev

author xinhe <xinhe@google.com>

Wed, 3 Dec 2014 23:39:29 +0000 (23:39 +0000)

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

Wed, 3 Dec 2014 23:39:32 +0000 (23:39 +0000)
author xinhe <xinhe@google.com>
Wed, 3 Dec 2014 23:39:29 +0000 (23:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 3 Dec 2014 23:39:32 +0000 (23:39 +0000)
diff --cc telephony/java/com/android/internal/telephony/IccCardConstants.java
Simple merge
author	xinhe <xinhe@google.com>
	Wed, 3 Dec 2014 23:39:29 +0000 (23:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 3 Dec 2014 23:39:32 +0000 (23:39 +0000)