tree ec3555006ffe7ca911fcac028f7929bcf4b8eecc
parent ce80092aafe0eea86ef8e462287782c653b3671b
parent fa67fe7a4ebfa19f8034938b751ef9a9b1ac9053
author Ying Xu <yinxu@google.com> 1497556087 +0000
committer android-build-merger <android-build-merger@google.com> 1497556087 +0000

Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2" into stage-aosp-master
am: fa67fe7a4e

Change-Id: I62d094ce16e65bf613e5e4b9405c87726e175c8f