tree 7993827ca293c28033ed4d2f099bbb172a6f0d17
parent c76525efc451f816c5b7b96b353e5fdf79e452e0
parent cb395324fe5862a8a4b82a967822aeaf83e0fabb
author Marco Nelissen <marcone@google.com> 1351189252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351189252 -0700

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

* commit 'cb395324fe5862a8a4b82a967822aeaf83e0fabb':
  Crash when no item selected in ControlPanelPicker