OSDN Git Service

resolve merge conflicts of 32d6669 to nyc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Wed, 1 Jun 2016 06:11:47 +0000 (06:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 06:11:47 +0000 (06:11 +0000)
commita1e031ab614f691e0eebe1f855778d2d22cedaa5
tree85cb6e389f00f1693c926a848fcd709fc997c175
parent9e3f998ba5b9cbea835df34f0fae7635b88906d7
parent4cd0416bdfcf6d55a8f1d615d8177f486d326dee
resolve merge conflicts of 32d6669 to nyc-dev-plus-aosp
am: 4cd0416bdf

* commit '4cd0416bdfcf6d55a8f1d615d8177f486d326dee':
  HID: Check for EINTR in uhid_event() and fix return value evaluation

Change-Id: Ib47c19a0d0234d03405b43484127673106e55e83