From: Andre Eisenbach <eisenbach@google.com>
Date: Fri, 29 Jan 2016 21:13:27 +0000 (+0000)
Subject: Merge "Add android.permission.DUMP for Bluetooth.apk" am: 4518460e7b
X-Git-Tag: android-7.1.2_r17~203
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=526c29a5e96f42171fe93feff7822ff1b2f1123f;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Add android.permission.DUMP for Bluetooth.apk" am: 4518460e7b
am: f211141b3c

* commit 'f211141b3c64010b2b8c5193815087cdef819fe1':
  Add android.permission.DUMP for Bluetooth.apk
---

526c29a5e96f42171fe93feff7822ff1b2f1123f