OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d20914e fd0fdaf)
am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when injection...
authorMichael Wright <michaelwr@google.com>
Mon, 29 Jun 2015 17:47:15 +0000 (17:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Jun 2015 17:47:15 +0000 (17:47 +0000)
* commit 'fd0fdaf73b1e8fbf643152f532f500be70f11a26':
  Send cancelation events to monitors when injection fails.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help