tree 4c6fd2cd3e253e6d885e1338c4d87a59561c6d3c
parent bc778ede573dc74646d42dfe96997f74b23ac61d
parent 0b8ca377f11f5a4f25c505f29c352024f9fcc0ae
author Marco Nelissen <marcone@google.com> 1351189092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351189092 -0700

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

* commit '0b8ca377f11f5a4f25c505f29c352024f9fcc0ae':
  Crash when no item selected in ControlPanelPicker