am eb046057: am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev
am eb046057: am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev

* commit 'eb046057399e30d158ec62c6566d37a6d0f1a5b1':
  Rename mChannels to mChannelMask

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base