tree 466a2ea7257cdd7aa1933a0cfb0f639774536979
parent 40b13798d735429d1f00d8a89113e9ab2ef88fca
parent c45128af9231a6e26c4deef798b79e74e4fad904
author Glenn Kasten <gkasten@google.com> 1353354832 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1353354833 -0800

Merge "Clean up channel count and channel mask"