From: Michael Wright <michaelwr@google.com>
Date: Mon, 29 Jun 2015 17:47:15 +0000 (+0000)
Subject: am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when injection... 
X-Git-Tag: android-x86-7.1-r1~957
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2e099b24258633ebe884515eb7719bdd82458ff2;p=android-x86%2Fframeworks-native.git

am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when injection fails." into mnc-dev

* commit 'fd0fdaf73b1e8fbf643152f532f500be70f11a26':
  Send cancelation events to monitors when injection fails.
---

2e099b24258633ebe884515eb7719bdd82458ff2