tree b8ced10b08e3a41f3c5cacfa833c85de41a68021
parent 598e833d42a687259bc3c9a5a39ad9ba8b105cbb
parent 2c9d8de79a0dd7f894c65777a197c86486aff96c
author Mike Lockwood <lockwood%android.com@gtempaccount.com> 1309354953 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309354953 -0700

am 2c9d8de7: Merge "Prevent buffer overflows."

* commit '2c9d8de79a0dd7f894c65777a197c86486aff96c':
  Prevent buffer overflows.