Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev

author Jeff Davidson <jpd@google.com>

Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)

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

Fri, 16 Jun 2017 19:40:02 +0000 (19:40 +0000)
author Jeff Davidson <jpd@google.com>
Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 16 Jun 2017 19:40:02 +0000 (19:40 +0000)
diff --cc telephony/java/android/telephony/euicc/EuiccManager.java
Simple merge
author	Jeff Davidson <jpd@google.com>
	Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 16 Jun 2017 19:40:02 +0000 (19:40 +0000)