am bb1d8e42: resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp

Browse Source

Merge commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8'

* commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8':
  libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-30 14:06:25 -07:00 committed by Android Git Automerger

parent 9abea13a0a bb1d8e42dd

commit 430185526b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available