tree da92d422c4fbfbfd7e8f577081691aac94ad2aa1
parent 098f6a78457476a4d3eedf57e9efaad5681c9c67
parent 3e12cd500a06053da91f5cb69837838ea7455067
author Erik Kline <ek@google.com> 1425353151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425353151 +0000

am 3e12cd50: Merge "reword channle to channel"

* commit '3e12cd500a06053da91f5cb69837838ea7455067':
  reword channle to channel