OSDN Git Service

am 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5a: DO NOT MERGE Fix security vulnerabil...
authorMiao Chou <mcchou@google.com>
Sat, 8 Aug 2015 00:27:52 +0000 (00:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Aug 2015 00:27:52 +0000 (00:27 +0000)
* commit '75d042a4c53c09f82b4a95cf82ded21ffbcb017f':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS


Trivial merge