OSDN Git Service

am a1a46a8e: am cd0ed2f1: Merge "CMSG_DATA should return an unsigned char*."
authorDan Albert <danalbert@google.com>
Fri, 11 Sep 2015 23:04:58 +0000 (23:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 23:04:58 +0000 (23:04 +0000)
* commit 'a1a46a8e946d1fd1c50f44e7e23f462e179ddbb1':
  CMSG_DATA should return an unsigned char*.


Trivial merge