OSDN Git Service

am 1a96db3e: resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 2 Sep 2014 17:34:14 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Sep 2014 17:34:14 +0000 (17:34 +0000)
commit4eac5ecf2b568335f53a71f43d023ddf6536fd20
tree901df04380782787be93e0204db3ac277dffd58a
parentaf09e0337e8a419ca644a1002140dfd7dc0228c9
parent1a96db3e8ea0b2a488a068c6f46f7e7ca2e5fc96
am 1a96db3e: resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp

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