OSDN Git Service

Merge "Raise native-crash socket timeout" into nyc-dev
authorChristopher Tate <ctate@google.com>
Fri, 22 Apr 2016 23:44:54 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 23:44:54 +0000 (23:44 +0000)
commit7b12283f586c52e473a53ec6fa9641ba60463521
tree6c480a36af4a18f0bbaa9b60b16fc3fc7f35114f
parent7c7af7bd710016636344437fee3038f5a98937d7
parentaa1b2e2d4e47ae186df31ffe10f1ed05b951b753
Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
  Raise native-crash socket timeout

Change-Id: I7e763182c48f7ec1fd36196e4ecf991cd602e500