am 9eb0d554: resolved conflicts for merge of ea8dea8c to lmp-mr1-dev-plus-aosp

* commit '9eb0d554bad86a62c370e7c31fa19b5f3dc90b36':
  Improve <sys/cdefs.h>.
This commit is contained in:
Elliott Hughes
2014-10-07 20:37:10 +00:00
committed by Android Git Automerger

Diff Content Not Available