am ca734ad2: am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'ca734ad2387629ff9afcd0d5c991074f8212920f'

* commit 'ca734ad2387629ff9afcd0d5c991074f8212920f':
  Fix launcher crash
tree: a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE