OSDN Git Service

am 24d6f481: resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 12 Oct 2010 08:45:47 +0000 (01:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Oct 2010 08:45:47 +0000 (01:45 -0700)
commit91ad0fe2d060598735fd1cbd2cff10fff4aa76ce
tree69fdbe5ebed47472bd2373fbf4f616efd1c93866
parent8dc3c07b1878d79fe0c39d79c5ce37ee43703d82
parent24d6f4813b84240bb839b93f163a52a8447ff583
am 24d6f481: resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp

Merge commit '24d6f4813b84240bb839b93f163a52a8447ff583'

* commit '24d6f4813b84240bb839b93f163a52a8447ff583':
  Fixed buffer overflow in procrank.