OSDN Git Service

Merge "Add read/write timeout to the audio sockets" into nyc-dev
authorPavlin Radoslavov <pavlin@google.com>
Tue, 3 May 2016 00:48:54 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 00:48:54 +0000 (00:48 +0000)
am: 8456e86576

* commit '8456e865765b86878f966ceee4a69038c465009e':
  Add read/write timeout to the audio sockets

Change-Id: I63e5de1002063e5601c8bc89f465e4b892026729


Trivial merge