tree 345ce131dd842007fb948f00118e0065b9fde33d
parent ab50acdbdf0ef453bda1a35cfd4d0d67a1afbdca
parent d6dfaf4c9d4e45134041cc066fb36b50e72387fb
author Beverly <beverlyt@google.com> 1574390340 -0800
committer android-build-merger <android-build-merger@google.com> 1574390340 -0800

[automerger skipped] Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev
am: d6dfaf4c9d -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 3fe3e8195a is in history

Change-Id: I297ae155044ca082cf1fb3002e2dcd0ce2281a82