am 541d9ccd: Reconcile with jb-release nakasi-factoryrom-release

* commit '541d9ccd4e0c177e29b4af35c1503330f94954bd':
  Avoid Resources$NotFoundException
  Fix a crash
main
The Android Open Source Project 2012-05-16 08:46:36 -07:00 committed by Android Git Automerger
commit 558d7a5e50

Diff Content Not Available