tree 6ada6f23d2e14157c2f06a64cc3548ddf3c3fb84
parent a6b47a17fb1288936b491f30cd751172a572df5c
parent a42ff007a17d63df22c60dd5e5fd811ee45ca1b3
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"