OSDN Git Service

Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev
authorAndrei Stingaceanu <stg@google.com>
Wed, 6 Apr 2016 14:34:03 +0000 (14:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 14:34:03 +0000 (14:34 +0000)
commit5c3ab1b8e7854ff4a1019c8c1d4cc63e9d9a4bd0
tree5991ab5d0688a2e6d7d687ba826698ee8d357e90
parent83d8678c29842e12c6bb34e143d11994a29ee6e3
parent2616fbf6315e9d8bc1bad32faff7767c33ae0b78
Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev
am: 2616fbf

* commit '2616fbf6315e9d8bc1bad32faff7767c33ae0b78':
  Keyboard Shortcuts: protect against NPE in WindowManagerService

Change-Id: I8fac6f2f0bbc4540e4b02ec6610d8d82054974f5