am c7f654df: am b83cad79: Merge "Fix two comment typos."

* commit 'c7f654dffea47a80ba566cd05f9212c8c7359a67':
  Fix two comment typos.
This commit is contained in:
Elliott Hughes 2012-10-09 17:39:51 -07:00 committed by Android Git Automerger
commit 5a16e92eb5
2 changed files with 2 additions and 2 deletions

View File

@ -376,7 +376,7 @@ static void malloc_init_impl() {
}
}
// Lets see which .so must be loaded for the requested debug level
// Choose the appropriate .so for the requested debug level.
switch (debug_level) {
case 1:
case 5:

View File

@ -366,7 +366,7 @@ extern "C" void* leak_memalign(size_t alignment, size_t bytes) {
alignment = 1L << (31 - __builtin_clz(alignment));
}
// here, aligment is at least MALLOC_ALIGNMENT<<1 bytes
// here, alignment is at least MALLOC_ALIGNMENT<<1 bytes
// we will align by at least MALLOC_ALIGNMENT bytes
// and at most alignment-MALLOC_ALIGNMENT bytes
size_t size = (alignment-MALLOC_ALIGNMENT) + bytes;