diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-30 14:06:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 14:06:25 -0700 |
| commit | 430185526b019e3bbe58f15a0365a07607619c90 (patch) | |
| tree | bdea3e5db4423dda798e8c6f77275263bc9c91b3 | |
| parent | 9abea13a0a5015a401c15ad6a2a1db1b337d9cdf (diff) | |
| parent | bb1d8e42dddcc89422b7add4b250d016d332bba8 (diff) | |
| download | system_core-430185526b019e3bbe58f15a0365a07607619c90.zip system_core-430185526b019e3bbe58f15a0365a07607619c90.tar.gz system_core-430185526b019e3bbe58f15a0365a07607619c90.tar.bz2 | |
am bb1d8e42: resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp
Merge commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8'
* commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8':
libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic
0 files changed, 0 insertions, 0 deletions