am 4c090434: Merge "removing shadowing redeclaration of result"

* commit '4c090434a4fcffb3a8bb7ebee7cc6e52befceeae':
  removing shadowing redeclaration of result
This commit is contained in:
David Turner 2011-04-05 07:35:09 -07:00 committed by Android Git Automerger
commit aad685ce00

View File

@ -84,7 +84,6 @@ static int hash_entry_compare(const void* arg1, const void* arg2)
//
// This is used for sorting, not determination of equality, so we don't
// need to compare the bit flags.
int result;
if (alloc1 > alloc2) {
result = -1;
} else if (alloc1 < alloc2) {