| commit | 019c5d920a9a5c2305a6eccfa020ad5fdfe878b3 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Aug 17 15:12:33 2010 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Aug 17 23:13:14 2010 -0700 |
| tree | c144084dd6e8e23cf9b75696194fc10b1036e919 | |
| parent | 18a859aff4e1b97d644429b7ecdb366b18d5a708 [diff] | |
| parent | 52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba [diff] |
Merge commit '52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba' into mm Conflicts: libc/Android.mk libc/arch-arm/include/machine/cpu-features.h libc/bionic/pthread.c libc/bionic/semaphore.c Change-Id: I599b069b71e381f8beb6c06acfde86b15e049273