| commit | e3b632ab990be54982fec0e73a7f1a5abab7fe58 | [log] [tgz] |
|---|---|---|
| author | Carl Shapiro <cshapiro@google.com> | Fri Feb 12 11:07:52 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 12 11:07:52 2010 -0800 |
| tree | eda5ad0fd22d02842ff6cdb6d946045398f3aa8f | |
| parent | b1268c6e3dd23ee5af7255e2da64363f6aa0bb72 [diff] | |
| parent | 81f3bf94f2191c53f51131202229af52512f52b7 [diff] |
Merge "Do not include assert.h in places where it may shadow the definition provided by Common.h if WITH_DALVIK_ASSERTS is defined. The include from HeapBitmap.h was notable as it redefined the Dalvik friendly assert macro with the useless libc macro across all of the GC sources." into dalvik-dev