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

am: 963a20772e

Change-Id: Ic64dff49ecec45c4c77486196a8661beec3b142f

2017-06-16 19:51:31 +00:00

..

android/telephony

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

2017-06-16 19:51:31 +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