From: Ajay Panicker <apanicke@google.com>
Date: Sat, 23 Apr 2016 00:02:04 +0000 (+0000)
Subject: Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bba7543785511b244ba74d32a3233abdb795a1c1;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Properly label app as unregistered and add NPE protection" into nyc-dev am: e062a53
am: 542d334

* commit '542d334a4902c65078acda1190fa9da4a2435d4a':

Change-Id: I3b9d8c022d8cf6d75172f17926b44b2d45c46c9b
---

bba7543785511b244ba74d32a3233abdb795a1c1