am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating...
am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '80688be6':
Consider channel index masks when calculating channel counts.