OSDN Git Service

am 883d129b: Merge "Add missing <malloc.h> include."
authorElliott Hughes <enh@google.com>
Wed, 28 Jan 2015 19:35:28 +0000 (19:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Jan 2015 19:35:28 +0000 (19:35 +0000)
* commit '883d129ba24bfc599b65b09fd0b5aaa0946d1958':
  Add missing <malloc.h> include.

1  2 
server/InterfaceController.cpp

Simple merge