Skip to content
Commit d42cb76a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I08c5006a,I6686b77c into qt-dev 

* changes:
  Handle null OnSettingsClickListeners in ChannelDialogEditorController
  Close channel dialog when the guts go away
parents 9054ff21 0e5378e6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment