tree 76cc14be9525f53fbf910c00884ebe4b5c9988c9
parent ae4b5f93444802632d71ec34373842e6f5febbaa
parent fad226abd12435dbcd232f7de396f1a097b2bd5f
author Glenn Kasten <gkasten@google.com> 1375132388 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375132394 +0000

Merge "Use standard name and type for channel mask"