fionaxu ec573fddcb resolve merge conflicts of 4ff3cf1eca to stage-aosp-master ...

Change-Id: Id8b10a739e6a313d74908d7fd7068d53ccf994a5

2017-06-21 13:50:51 -07:00

..

android/telephony

resolve merge conflicts of 4ff3cf1eca to stage-aosp-master

2017-06-21 13:50:51 -07:00

com/android

Use java.util.Objects.hashCode to get hashcode.

2017-06-14 10:54:05 -07:00