OSDN Git Service

resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp
authorDmitry Torokhov <dtor@google.com>
Thu, 8 Oct 2015 16:36:47 +0000 (09:36 -0700)
committerDmitry Torokhov <dtor@google.com>
Thu, 8 Oct 2015 16:36:47 +0000 (09:36 -0700)
commit3b9211608669eb5aafba65d35b4cfbec89755499
tree872a17e0271f931720d9dc8158877c0cac2fda1c
parent313762d88e7820e689879e08f4a93eac3cf8af99
parentb916390540277219aca6aefef7f452374ff890d5
resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp

Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f
include/input/KeyCharacterMap.h
libs/input/KeyCharacterMap.cpp