OSDN Git Service

am f29687ed: am 2c7ffe6b: (-s ours) am 1267abe1: am b117219a: am 46f1dd6d: am 19004c7...
authorMiao Chou <mcchou@google.com>
Sat, 8 Aug 2015 00:50:11 +0000 (00:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Aug 2015 00:50:11 +0000 (00:50 +0000)
* commit 'f29687ed0e0ff7c90bd43f89190ca0568f6135ae':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS


Trivial merge