am 1a96db3e: resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp

Browse Source

* commit '1a96db3e8ea0b2a488a068c6f46f7e7ca2e5fc96':
  Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc.

...

This commit is contained in:

Elliott Hughes

2014-09-02 17:34:14 +00:00

committed by Android Git Automerger

parent af09e0337e 1a96db3e8e

commit 4eac5ecf2b

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

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

Diff Content Not Available