tree 0b46678191e11c34db937aa208a4e361bb7a2190
parent 1df848d11b04e778f822244901bace94b0ea825d
parent 425bf818f27d2ee92b73c8f0d7d375d88d28dd68
author Paul McLean <pmclean@google.com> 1410554068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410554068 +0000

am 425bf818: Merge "Special-case handling of MONO to/from Multichannel conversions." into lmp-dev

* commit '425bf818f27d2ee92b73c8f0d7d375d88d28dd68':
  Special-case handling of MONO to/from Multichannel conversions.