resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp

Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f

diff --cc include/input/KeyCharacterMap.h
index 111139b,3f0914b..eb5840e
--- 1/include/input/KeyCharacterMap.h
--- 2/include/input/KeyCharacterMap.h
+++ b/include/input/KeyCharacterMap.h
@@@ -124,7 -124,12 +124,12 @@@ public
       * the mapping in some way. */
      status_t mapKey(int32_t scanCode, int32_t usageCode, int32_t* outKeyCode) const;
  
 -#if HAVE_ANDROID_OS
+     /* Tries to find a replacement key code for a given key code and meta state
+      * in character map. */
+     void tryRemapKey(int32_t scanCode, int32_t metaState,
+             int32_t* outKeyCode, int32_t* outMetaState) const;
+ 
 +#ifdef __ANDROID__
      /* Reads a key map from a parcel. */
      static sp<KeyCharacterMap> readFromParcel(Parcel* parcel);
  

diff --cc libs/input/KeyCharacterMap.cpp
Simple merge