Jeff Davidson 08daf32950 Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am: 963a20772e" into oc-dr1-dev-plus-aosp ...

am: 3806a1d477

Change-Id: I0af40ca1281103c1b82a8046339a42bb0cf3dc33

2017-06-16 20:11:39 +00:00

..

android/telephony

Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am: 963a20772e" into oc-dr1-dev-plus-aosp

2017-06-16 20:11:39 +00:00

com/android

Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c

2017-06-15 19:56:18 +00:00