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

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