OSDN Git Service

am 2c9d8de7: Merge "Prevent buffer overflows."
authorMike Lockwood <lockwood%android.com@gtempaccount.com>
Wed, 29 Jun 2011 13:42:33 +0000 (06:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 13:42:33 +0000 (06:42 -0700)
* commit '2c9d8de79a0dd7f894c65777a197c86486aff96c':
  Prevent buffer overflows.

1  2 
Devmapper.cpp
Loop.cpp

diff --cc Devmapper.cpp
Simple merge
diff --cc Loop.cpp
Simple merge