tree 2558e85f40352aa7b5e1cc9ef7f5072ef5167537
parent 0ad682cddef396c91707a31d4982dc55206dca1b
parent 89f7ba3df8fc359023b494c2e625beed900bc706
author Glenn Kasten <gkasten@google.com> 1332167510 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332167510 -0700

Merge "audio_channel_in/out_mask_from_count"