am 539ed9df: PASSION ONLY - fix npe

Merge commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7'

* commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7':
  PASSION ONLY - fix npe
tree: 55498ff42a7a8142ffe0a9b04766784298fc328c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE