tree 4f76f22c35496716c2f8e9112b01fc0891dddc53
parent 8be3dcd82c23e519667cd6b362d4864a1c44cb8e
parent 93368f9602fa72be364f5286b4148b0bd8b964e5
author Phil Burk <philburk@google.com> 1493153852 +0000
committer android-build-merger <android-build-merger@google.com> 1493153852 +0000

Merge "aaudio: change samplesPerFrame() to channelCount()" into oc-dev am: 89b67d6054
am: 93368f9602

Change-Id: I7ebd1c3a347715dc4aaef8a2a382c9171d0cc08b