OSDN Git Service

am ea21b5da: (-s ours) am 549c64d1: Fix security vulnerabilities in string operations
authorMiao Chou <mcchou@google.com>
Thu, 27 Aug 2015 10:54:10 +0000 (10:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:54:10 +0000 (10:54 +0000)
* commit 'ea21b5dae90c8c51da2ccc22e8a8f2f8615fc961':


Trivial merge