tree 94b16f8b6acdfb3c7097b8c05d1916ad82b0f762
parent 5048cd77dc439446fe3da2a8186bceb25a84e9b3
parent 176a8a8b7cba2654f50617b14a841ef977b95b11
author Dianne Hackborn <hackbod@google.com> 1340386987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340386987 -0700

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.