am 176a8a8b: am 0b9b053c: Merge "Don\'t crash in window manager if we fail getting .apk resources." into jb-dev

* commit '176a8a8b7cba2654f50617b14a841ef977b95b11':
  Don't crash in window manager if we fail getting .apk resources.