summaryrefslogtreecommitdiffstats
path: root/services/core/jni/com_android_server_ConsumerIrService.cpp
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 6290c048 to lmp-mr1-dev-plus-aospAndreas Gampe2014-09-291-3/+3
* am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrServ...Narayan Kamath2014-02-111-8/+8
* Move some system services to separate directoriesAmith Yamasani2013-12-191-0/+114