OSDN Git Service

am 38b70dd3: (-s ours) am 89cdf16b: am 2816b2cb: am 0a268209: am 6b58105c: am 75d042a...
authorMiao Chou <mcchou@google.com>
Sat, 8 Aug 2015 01:02:32 +0000 (01:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Aug 2015 01:02:32 +0000 (01:02 +0000)
* commit '38b70dd36255415c1a9fa638122ad4689846f393':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS


Trivial merge