am d3a72135: am bfb64e85: am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
am d3a72135: am bfb64e85: am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev

# Via Android Git Automerger (2) and others
* commit 'd3a72135c82ae221881853912a6866467e86d9f2':
  SimulatdDpad: fix NPE for event without device

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base