OSDN Git Service

am 938473a7: resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Mon, 8 Sep 2014 23:32:32 +0000 (23:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Sep 2014 23:32:32 +0000 (23:32 +0000)
commiteeb13c6bdbe57aa91aefde27377d4d49efb03901
treed5d2c9fd2a0163a9fe948cd8bbc4cf1ef61982d8
parentb614b0594244c5351c16b092e96190b0b7c5b684
parent938473a7f031822d7449624f5844c07d23814422
am 938473a7: resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

* commit '938473a7f031822d7449624f5844c07d23814422':
  Ensure __set_errno is still visible on LP32.