From: Ian Rogers <irogers@google.com>
Date: Thu, 5 May 2016 20:46:01 +0000 (+0000)
Subject: Merge "Fix divergent equals and hashCode behavior am: 27b250928c am: c0396c8336"... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cac31ede0ddc75e001e7d20de9957a9caa804e78;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Fix divergent equals and hashCode behavior am: 27b250928c am: c0396c8336" into nyc-mr1-dev-plus-aosp
am: af2758310e

* commit 'af2758310e8b7c5d33741696377ffa1cb48ccb06':

Change-Id: I9114aec5950a15ce902c0e466b16b173794f44a3
---

cac31ede0ddc75e001e7d20de9957a9caa804e78