am cb395324: am 0b8ca377: Merge "Crash when no item selected in ControlPanelPicker"

* commit 'cb395324fe5862a8a4b82a967822aeaf83e0fabb':
  Crash when no item selected in ControlPanelPicker
tree: 7993827ca293c28033ed4d2f099bbb172a6f0d17
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml