tree d7fe3a5b926fb435fb4e83eba0c6dc2d05e5ee1a
parent 8e8d92070887105d686f67f0a049c9cdefb8a919
parent 9f42dfb7990a107da23454669459bb5e28d90726
author Marco Nelissen <marcone@google.com> 1442283156 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442283156 +0000

am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config

* commit '9f42dfb7990a107da23454669459bb5e28d90726':
  Fix crash on invalid channel config