OSDN Git Service

am 32ec7498: am 1c7b84ca: Merge changes Ia1777fd4,I3998d88b
authorDan Albert <danalbert@google.com>
Tue, 8 Sep 2015 20:38:46 +0000 (20:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Sep 2015 20:38:46 +0000 (20:38 +0000)
* commit '32ec74987344cedb5596e6da1891a9d54962f149':
  Unify unistd.h.
  Use attribute availability.


Trivial merge