| commit | 91ad0fe2d060598735fd1cbd2cff10fff4aa76ce | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 12 01:45:47 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 01:45:47 2010 -0700 |
| tree | 69fdbe5ebed47472bd2373fbf4f616efd1c93866 | |
| parent | 8dc3c07b1878d79fe0c39d79c5ce37ee43703d82 [diff] | |
| parent | 24d6f4813b84240bb839b93f163a52a8447ff583 [diff] |
am 24d6f481: resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp Merge commit '24d6f4813b84240bb839b93f163a52a8447ff583' * commit '24d6f4813b84240bb839b93f163a52a8447ff583': Fixed buffer overflow in procrank.