tree ef9cd2fdd0f2d64cacd16d2bac396679d26c899a
parent 2d613a114407dd0e88f59ca00eac60888c1e7569
parent d3b05ac632af209b395cc702d26815c1c54d2119
author Wink Saville <wink@google.com> 1378750157 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378750157 -0700

am d3b05ac6: Merge "Stk: Open Channel Fixes"

* commit 'd3b05ac632af209b395cc702d26815c1c54d2119':
  Stk: Open Channel Fixes