OSDN Git Service

Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc...
authorAndrei Stingaceanu <stg@google.com>
Wed, 6 Apr 2016 14:36:49 +0000 (14:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 14:36:49 +0000 (14:36 +0000)
commit16be436e2b45c6643667c344cb9c959669383b9a
treee2b7222367c2a15d98d3800d3f1f1c32451d111f
parentc7fa18475ecbb3f043a51b546ff4c5a7ff1297e7
parent5c3ab1b8e7854ff4a1019c8c1d4cc63e9d9a4bd0
Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev am: 2616fbf
am: 5c3ab1b

* commit '5c3ab1b8e7854ff4a1019c8c1d4cc63e9d9a4bd0':
  Keyboard Shortcuts: protect against NPE in WindowManagerService

Change-Id: I4c93cac9e624ff0aa74fad8101732ee16cbdadf8