OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 11:11:38 +0000 (13:11 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 11:11:38 +0000 (13:11 +0200)
commit077157a5323844b2e64ac8b45f1a6aca220db1e6
tree26b443db1dd5c26999478e4f66f9592f55d6b7d9
parentae4a79c49f7683a8b65b1a3a288c2bc1ac27fd9e
parent3b418d69a3e1b3594aec4ad065a47353da407e12
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
services/inputflinger/InputReader.cpp
services/surfaceflinger/Android.mk
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h