From: Calvin On <con@google.com>
Date: Fri, 22 Apr 2016 22:15:36 +0000 (+0000)
Subject: Merge "Synchronize access to ServiceDeclaration fields. am: f8ecbbb am: a37273e"... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a73f7ac84dbe79af9df90c3d7f0d5da7ab814ba1;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Synchronize access to ServiceDeclaration fields. am: f8ecbbb am: a37273e" into nyc-mr1-dev-plus-aosp
am: 50f1562

* commit '50f1562e1f348d576ed8230dab82616f857ae2aa':

Change-Id: I71d7b8ec09dce9d59552fbabf0ccd4081eaa768b
---

a73f7ac84dbe79af9df90c3d7f0d5da7ab814ba1