From: Miao Chou <mcchou@google.com>
Date: Sat, 8 Aug 2015 00:23:15 +0000 (+0000)
Subject: am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities in permission... 
X-Git-Tag: android-7.1.2_r17~195^2~32^2~5^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b117219a;p=android-x86%2Fpackages-apps-Bluetooth.git

am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

* commit '46f1dd6d20d4108a44f06137a176d6548c6a0ac6':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
---

b117219a842d3aacaf0ee4e790a01417aaf05213